费用结算模块

src/main/java/com/ydtech/modules/fnc/dao/InsPlySettleMapper.java

@@ -26,7 +26,7 @@ public interface InsPlySettleMapper extends BaseMapper<InsPlySettle> {
     String getMaxBatch(InsPlySettle insPlySettle);
 
     @Select({"<script>"," " +
-            "select a.*,b.`name` dept_name ,c.`name` companyName,d.hxamount ,d.commissionHxamount , d.otherHxamount " +
+            "select a.*,b.`name` dept_name ,c.`name` companyName,ifnull(d.hxamount,0) hxamount ,ifnull(d.commissionHxamount,0) commissionHxamount , ifnull(d.otherHxamount,0) otherHxamount " +
             "from ins_ply_settle a " +
             "left join sys_dept b on a.dept_id=b.id " +
             "left join esm_ins_company c on a.company_id=c.id " +

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

@@ -85,16 +85,18 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
 
         InsOrders order=insOrdersMapper.selectById(orderNo);
         InsFeeOrder insFeeOrder=insFeeOrderService.getByInsOrderNo(insFeeAudit.getInsOrderNo());
+        InsAreaCompany insAreaCompany=insAreaCompanyService.getById(insFeeAudit.getInsOrderNo());
+
         //bigdecimal为null时设置为0
         handleBigdecimal(insFeeOrder);
         //生成保司费用（应收费用）
-        gene_orderIncome( order, insFeeOrder);
+        gene_orderIncome( order, insFeeOrder,insAreaCompany);
         //生成机构费用
-        gene_deptfee( order, insFeeOrder);
+        gene_deptfee( order, insFeeOrder,insAreaCompany);
         //生成分销费用
-        saveRetail(order,insFeeOrder);
+        saveRetail(order,insFeeOrder,insAreaCompany);
         //个代费用生成
-        saveInsCompanyFee(order,insFeeOrder);
+        saveInsCompanyFee(order,insFeeOrder,insAreaCompany);
     }
 
     private void handleBigdecimal(InsFeeOrder insFeeOrder)
@@ -139,8 +141,8 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
      * @param insFeeOrder
      * @throws Exception
      */
-    private void gene_orderIncome( InsOrders order, InsFeeOrder insFeeOrder) throws Exception{
-        InsAreaCompanyQueryDto plyDto=insAreaCompanyService.getByOrderNo(order.getOrderno()).get(0);
+    private void gene_orderIncome( InsOrders order, InsFeeOrder insFeeOrder,InsAreaCompany plyDto) throws Exception{
+
         InsPlyIncome insPlyIncome =new InsPlyIncome();
         insPlyIncome.setOrderno(order.getOrderno());
         insPlyIncome.setDeptId(order.getDeptid());
@@ -181,13 +183,29 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
      * @param insFeeOrder
      * @throws Exception
      */
-    private void gene_deptfee( InsOrders order, InsFeeOrder insFeeOrder) throws Exception{
+    private void gene_deptfee( InsOrders order, InsFeeOrder insFeeOrder,InsAreaCompany plyDto) throws Exception{
         InsDeptFee deptFee = new InsDeptFee();
         deptFee.setOrderno(order.getOrderno());
         deptFee.setQuoteno(insFeeOrder.getInsOrderNo());
-        deptFee.setAgreeid(insFeeOrder.getAgreementId());
+        deptFee.setAgreeid(plyDto.getAgreementId());
         deptFee.setAuditstatus("1");
         deptFee.setSettlestatus("0");
+        if(StringUtils.isNotEmpty(plyDto.getJqpolicyno())){
+            deptFee.setPolicyno(plyDto.getJqpolicyno());
+            deptFee.setRiskcode("交强");
+            deptFee.setLicenseno(order.getLicenseno());
+            geneInsDeptFee(order, insFeeOrder, deptFee);
+        }
+        if(StringUtils.isNotEmpty(plyDto.getSypolicyno())){
+            deptFee.setPolicyno(plyDto.getSypolicyno());
+            deptFee.setRiskcode("商业");
+            deptFee.setLicenseno(order.getLicenseno());
+            geneInsDeptFee(order, insFeeOrder, deptFee);
+        }
+
+    }
+
+    private void geneInsDeptFee(InsOrders order, InsFeeOrder insFeeOrder, InsDeptFee deptFee) {
         if (insFeeOrder.getFirstDeptPremiums().doubleValue() > 0) {
             deptFee.setComcode(order.getDeptid().substring(0, 2));  //99140302M01D01
             deptFee.setKeeprate(insFeeOrder.getFirstDeptProportion().doubleValue() * 0.01);
@@ -231,9 +249,10 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
      * @param order
      * @return
      */
-    public void saveRetail(InsOrders order,InsFeeOrder insFeeOrder) throws Exception{
+    public void saveRetail(InsOrders order,InsFeeOrder insFeeOrder,InsAreaCompany plyDto) throws Exception{
         List<String> userlist=new ArrayList<>();
         esmUserReferrerService.getUpUser(order.getUserid(),userlist);
+
         //userlist:包括本人在内向上所有人
         if(userlist.size()-1>0){
             if(userlist.size()-1>=1
@@ -245,13 +264,27 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
                 commission.setQuoteno(insFeeOrder.getInsOrderNo());
                 commission.setRefereescode(user.getId());
                 commission.setRefereesname(user.getName());
-                commission.setCommissionrate(insFeeOrder.getThirdRetailProportion().doubleValue()* 0.01);
-                commission.setCommissionamount(insFeeOrder.getThirdRetailPremiums().doubleValue());
                 commission.setLevel("3");
                 commission.setAuditstatus("1");  //0未审核 1已审核
                 commission.setSettlestatus("0"); //0未结算 1已结算
                 commission.setInsuredtime(DateUtil.getDateFormat(new Date(),DateUtil.FULL_TIME_SPLIT_PATTERN)); //承保确认时间
-                insCommissionService.insert(commission);
+                if(StringUtils.isNotEmpty(plyDto.getJqpolicyno())){
+                    commission.setPolicyno(plyDto.getJqpolicyno());
+                    commission.setRiskcode("交强");
+                    commission.setLicenseno(order.getLicenseno());
+                    commission.setCommissionrate(insFeeOrder.getThirdRetailProportion().doubleValue()* 0.01);
+                    commission.setCommissionamount(insFeeOrder.getJqNoTaxPremium().multiply(insFeeOrder.getThirdRetailProportion()).divide(new BigDecimal(100)).doubleValue());
+                    insCommissionService.insert(commission);
+                }
+                if(StringUtils.isNotEmpty(plyDto.getSypolicyno())){
+                    commission.setPolicyno(plyDto.getSypolicyno());
+                    commission.setRiskcode("商业");
+                    commission.setLicenseno(order.getLicenseno());
+                    commission.setCommissionrate(insFeeOrder.getThirdRetailProportion().doubleValue()* 0.01);
+                    commission.setCommissionamount(insFeeOrder.getSyNoTaxPremium().multiply(insFeeOrder.getThirdRetailProportion()).divide(new BigDecimal(100)).doubleValue());
+                    insCommissionService.insert(commission);
+                }
+
             }
             if(userlist.size()-1>=2
                     &&insFeeOrder.getSecondRetailPremiums().doubleValue()>0)
@@ -262,14 +295,28 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
                 commission.setQuoteno(insFeeOrder.getInsOrderNo());
                 commission.setRefereescode(user.getId());
                 commission.setRefereesname(user.getName());
-                commission.setCommissionrate(insFeeOrder.getSecondRetailProportion().doubleValue()* 0.01);
-                commission.setCommissionamount(insFeeOrder.getSecondRetailPremiums().doubleValue());
+//                commission.setCommissionrate(insFeeOrder.getSecondRetailProportion().doubleValue()* 0.01);
+//                commission.setCommissionamount(insFeeOrder.getSecondRetailPremiums().doubleValue());
                 commission.setLevel("2");
                 commission.setAuditstatus("1");  //0未审核 1已审核
                 commission.setSettlestatus("0"); //0未结算 1已结算
                 commission.setInsuredtime(DateUtil.getDateFormat(new Date(),DateUtil.FULL_TIME_SPLIT_PATTERN)); //承保确认时间
-
-                insCommissionService.insert(commission);
+                if(StringUtils.isNotEmpty(plyDto.getJqpolicyno())){
+                    commission.setPolicyno(plyDto.getJqpolicyno());
+                    commission.setRiskcode("交强");
+                    commission.setLicenseno(order.getLicenseno());
+                    commission.setCommissionrate(insFeeOrder.getSecondRetailProportion().doubleValue()* 0.01);
+                    commission.setCommissionamount(insFeeOrder.getJqNoTaxPremium().multiply(insFeeOrder.getSecondRetailProportion()).divide(new BigDecimal(100)).doubleValue());
+                    insCommissionService.insert(commission);
+                }
+                if(StringUtils.isNotEmpty(plyDto.getSypolicyno())){
+                    commission.setPolicyno(plyDto.getSypolicyno());
+                    commission.setRiskcode("商业");
+                    commission.setLicenseno(order.getLicenseno());
+                    commission.setCommissionrate(insFeeOrder.getSecondRetailProportion().doubleValue()* 0.01);
+                    commission.setCommissionamount(insFeeOrder.getSyNoTaxPremium().multiply(insFeeOrder.getSecondRetailProportion()).divide(new BigDecimal(100)).doubleValue());
+                    insCommissionService.insert(commission);
+                }
             }
             if(userlist.size()-1>=3
                     &&insFeeOrder.getFirstRetailPremiums().doubleValue()>0)
@@ -280,14 +327,28 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
                 commission.setQuoteno(insFeeOrder.getInsOrderNo());
                 commission.setRefereescode(user.getId());
                 commission.setRefereesname(user.getName());
-                commission.setCommissionrate(insFeeOrder.getFirstRetailProportion().doubleValue()* 0.01);
-                commission.setCommissionamount(insFeeOrder.getFirstRetailPremiums().doubleValue());
+//                commission.setCommissionrate(insFeeOrder.getFirstRetailProportion().doubleValue()* 0.01);
+//                commission.setCommissionamount(insFeeOrder.getFirstRetailPremiums().doubleValue());
                 commission.setLevel("1");
                 commission.setAuditstatus("1");  //0未审核 1已审核
                 commission.setSettlestatus("0"); //0未结算 1已结算
                 commission.setInsuredtime(DateUtil.getDateFormat(new Date(),DateUtil.FULL_TIME_SPLIT_PATTERN)); //承保确认时间
-
-                insCommissionService.insert(commission);
+                if(StringUtils.isNotEmpty(plyDto.getJqpolicyno())){
+                    commission.setPolicyno(plyDto.getJqpolicyno());
+                    commission.setRiskcode("交强");
+                    commission.setLicenseno(order.getLicenseno());
+                    commission.setCommissionrate(insFeeOrder.getFirstRetailProportion().doubleValue()* 0.01);
+                    commission.setCommissionamount(insFeeOrder.getJqNoTaxPremium().multiply(insFeeOrder.getFirstRetailProportion()).divide(new BigDecimal(100)).doubleValue());
+                    insCommissionService.insert(commission);
+                }
+                if(StringUtils.isNotEmpty(plyDto.getSypolicyno())){
+                    commission.setPolicyno(plyDto.getSypolicyno());
+                    commission.setRiskcode("商业");
+                    commission.setLicenseno(order.getLicenseno());
+                    commission.setCommissionrate(insFeeOrder.getFirstRetailProportion().doubleValue()* 0.01);
+                    commission.setCommissionamount(insFeeOrder.getSyNoTaxPremium().multiply(insFeeOrder.getFirstRetailProportion()).divide(new BigDecimal(100)).doubleValue());
+                    insCommissionService.insert(commission);
+                }
             }
         }
     }
@@ -299,31 +360,14 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
      * @param insFeeOrder
      * @throws Exception
      */
-    public void saveInsCompanyFee(InsOrders order,InsFeeOrder insFeeOrder) throws Exception {
-        InsAreaCompany insAreaCompany=insAreaCompanyService.getById(insFeeOrder.getInsOrderNo());
+    public void saveInsCompanyFee(InsOrders order,InsFeeOrder insFeeOrder,InsAreaCompany plyDto) throws Exception {
 
         InsCompanyFee insCompanyFee = new InsCompanyFee();
         insCompanyFee.setOrderno(order.getOrderno());
-        BigDecimal dept_rate=insFeeOrder.getFirstDeptProportion()
-                .add(insFeeOrder.getSecondDeptProportion())
-                .add(insFeeOrder.getThirdDeptProportion())
-                .add(insFeeOrder.getForthDeptProportion())
-                .add(insFeeOrder.getFifthDeptProportion());
-        BigDecimal retail_rate=insFeeOrder.getFirstRetailProportion()
-                .add(insFeeOrder.getSecondRetailProportion())
-                .add(insFeeOrder.getThirdRetailProportion());
-        //交强费用比例=交强险费用比例-五级机构管理费比例-三级分销比例
-        insCompanyFee.setFeerate(insFeeOrder.getJqCostsProportion().subtract(dept_rate).subtract(retail_rate).doubleValue());
-        //商业费用比例=商业险费用比例-五级机构管理费比例-三级分销比例
-        insCompanyFee.setDisrate(insFeeOrder.getSyCostsProportion().subtract(dept_rate).subtract(retail_rate).doubleValue());
-        insCompanyFee.setFeeamount(insFeeOrder.getJqNoTaxPremium().multiply(insFeeOrder.getJqCostsProportion().subtract(dept_rate).subtract(retail_rate)).divide(new BigDecimal(100)).setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue());
-        insCompanyFee.setDisamount(insFeeOrder.getSyNoTaxPremium().multiply(insFeeOrder.getSyCostsProportion().subtract(dept_rate).subtract(retail_rate)).divide(new BigDecimal(100)).setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue());
-        insCompanyFee.setJqpremium(insFeeOrder.getJqNoTaxPremium().doubleValue());
-        insCompanyFee.setSypremium(insFeeOrder.getSyNoTaxPremium().doubleValue());
         insCompanyFee.setFrameNo(order.getFrameno());
         insCompanyFee.setLicenseNo(order.getLicenseno());
-        insCompanyFee.setInscompany(insAreaCompany.getCompanyId());
-        insCompanyFee.setAgreeid(insFeeOrder.getAgreementId());
+        insCompanyFee.setInscompany(plyDto.getCompanyId());
+        insCompanyFee.setAgreeid(plyDto.getAgreementId());
         insCompanyFee.setUserid(order.getUserid());
         insCompanyFee.setUsername(order.getUsername());
         insCompanyFee.setDeptid(order.getDeptid());
@@ -331,7 +375,38 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
         insCompanyFee.setSettletype("B");
         insCompanyFee.setSettlestatus("0");
         insCompanyFee.setCreatetime(DateUtil.getDateFormat(new Date(),DateUtil.FULL_TIME_SPLIT_PATTERN));
-        //保存业务员费用
-        insCompanyFeeService.insert(insCompanyFee);
+
+        BigDecimal dept_rate=insFeeOrder.getFirstDeptProportion()
+                .add(insFeeOrder.getSecondDeptProportion())
+                .add(insFeeOrder.getThirdDeptProportion())
+                .add(insFeeOrder.getForthDeptProportion())
+                .add(insFeeOrder.getFifthDeptProportion());
+        BigDecimal retail_rate=insFeeOrder.getFirstRetailProportion()
+                .add(insFeeOrder.getSecondRetailProportion())
+                .add(insFeeOrder.getThirdRetailProportion());
+        if(StringUtils.isNotEmpty(plyDto.getJqpolicyno())){
+            insCompanyFee.setPolicyno(plyDto.getJqpolicyno());
+            insCompanyFee.setRiskcode("交强");
+            //交强费用比例=交强险费用比例-五级机构管理费比例-三级分销比例
+            insCompanyFee.setFeerate(insFeeOrder.getJqCostsProportion().subtract(dept_rate).subtract(retail_rate).doubleValue());
+            insCompanyFee.setFeeamount(insFeeOrder.getJqNoTaxPremium().multiply(insFeeOrder.getJqCostsProportion().subtract(dept_rate).subtract(retail_rate)).divide(new BigDecimal(100)).setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue());
+            insCompanyFee.setJqpremium(insFeeOrder.getJqNoTaxPremium().doubleValue());
+            //保存业务员费用
+            insCompanyFeeService.insert(insCompanyFee);
+        }
+        if(StringUtils.isNotEmpty(plyDto.getSypolicyno())){
+            insCompanyFee.setPolicyno(plyDto.getSypolicyno());
+            insCompanyFee.setRiskcode("商业");
+            insCompanyFee.setFeerate(0);
+            insCompanyFee.setFeeamount(0);
+            insCompanyFee.setJqpremium(0);
+            //商业费用比例=商业险费用比例-五级机构管理费比例-三级分销比例
+            insCompanyFee.setDisrate(insFeeOrder.getSyCostsProportion().subtract(dept_rate).subtract(retail_rate).doubleValue());
+            insCompanyFee.setDisamount(insFeeOrder.getSyNoTaxPremium().multiply(insFeeOrder.getSyCostsProportion().subtract(dept_rate).subtract(retail_rate)).divide(new BigDecimal(100)).setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue());
+            insCompanyFee.setSypremium(insFeeOrder.getSyNoTaxPremium().doubleValue());
+            //保存业务员费用
+            insCompanyFeeService.insert(insCompanyFee);
+        }
+
     }
 }

src/main/java/com/ydtech/modules/ins/dao/impl/InsCommissionDaoImpl.java

@@ -118,12 +118,12 @@ public class InsCommissionDaoImpl implements InsCommissionDao {
     @Override
     public Integer insert(InsCommission model) {
 
-        String sql = "insert into ins_commission (orderno,quoteno,refereescode,refereesname,commissionrate,commissionamount,level,auditstatus,settlestatus,insuredtime) " +
-                "values ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ";
+        String sql = "insert into ins_commission (orderno,policyno,licenseno,riskcode,quoteno,refereescode,refereesname,commissionrate,commissionamount,level,auditstatus,settlestatus,insuredtime) " +
+                "values ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ";
 
         JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
 
-        Object[] params = new Object[]{model.getOrderno(), model.getQuoteno(), model.getRefereescode(), model.getRefereesname(), model.getCommissionrate(), model.getCommissionamount(), model.getLevel(), model.getAuditstatus(), model.getSettlestatus(), model.getInsuredtime()};
+        Object[] params = new Object[]{model.getOrderno(),model.getPolicyno(),model.getLicenseno(),model.getRiskcode(), model.getQuoteno(), model.getRefereescode(), model.getRefereesname(), model.getCommissionrate(), model.getCommissionamount(), model.getLevel(), model.getAuditstatus(), model.getSettlestatus(), model.getInsuredtime()};
 
         int out = jdbcTemplate.update(sql, params);
 

src/main/java/com/ydtech/modules/ins/dao/impl/InsCompanyFeeDaoImpl.java

@@ -156,12 +156,12 @@ public class InsCompanyFeeDaoImpl implements InsCompanyFeeDao {
     @Override
     public Integer insert(InsCompanyFee model) {
 
-        String sql = "insert into ins_companyfee (orderno,settleno,feerate,disrate,feeamount,disamount,jqpremium,sypremium,frameNo,licenseNo,inscompany,agreeid,agreementcode,agreeprodid,producname,agreetype,settlestatus,settletime,settletype,userid,username,deptid,deptname,createtime) " +
-                "values ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?, ?, ?, ?, ?, ?,?, ?, ?) ";
+        String sql = "insert into ins_companyfee (orderno,policyno,licenseno,riskcode,settleno,feerate,disrate,feeamount,disamount,jqpremium,sypremium,frameNo,inscompany,agreeid,agreementcode,agreeprodid,producname,agreetype,settlestatus,settletime,settletype,userid,username,deptid,deptname,createtime) " +
+                "values ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?, ?, ?, ?, ?,?, ?,?, ?, ?) ";
 
         JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
 
-        Object[] params = new Object[]{model.getOrderno(), model.getSettleno(), model.getFeerate(), model.getDisrate(), model.getFeeamount(), model.getDisamount(), model.getJqpremium(), model.getSypremium(), model.getFrameNo(), model.getLicenseNo(),
+        Object[] params = new Object[]{model.getOrderno(),model.getPolicyno(),model.getLicenseNo(),model.getRiskcode(), model.getSettleno(), model.getFeerate(), model.getDisrate(), model.getFeeamount(), model.getDisamount(), model.getJqpremium(), model.getSypremium(), model.getFrameNo(),
                 model.getInscompany(), model.getAgreeid(), model.getAgreementcode(), model.getAgreeprodid(), model.getProducname(), model.getAgreetype(), model.getSettlestatus(), model.getSettletime(), model.getSettletype(), model.getUserid(), model.getUsername(), model.getDeptid(), model.getDeptname(), model.getCreatetime()};
 
         int out = jdbcTemplate.update(sql, params);

src/main/java/com/ydtech/modules/ins/dao/impl/InsDeptFeeDaoImpl.java

@@ -155,12 +155,12 @@ public class InsDeptFeeDaoImpl implements InsDeptFeeDao {
     @Override
     public Integer insert(InsDeptFee model) {
 
-        String sql = "insert into ins_deptfee (orderno,quoteno,agreeid,agreeprodid,comlevel,comcode,keeprate,addrate,keepamount,addamount,auditstatus,settlestatus) " +
-                "values ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ";
+        String sql = "insert into ins_deptfee (orderno,policyno,licenseno,riskcode,quoteno,agreeid,agreeprodid,comlevel,comcode,keeprate,addrate,keepamount,addamount,auditstatus,settlestatus) " +
+                "values ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ";
 
         JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
 
-        Object[] params = new Object[]{model.getOrderno(), model.getQuoteno(), model.getAgreeid(), model.getAgreeprodid(), model.getComlevel(), model.getComcode(), model.getKeeprate(), model.getAddrate(), model.getKeepamount(), model.getAddamount(), model.getAuditstatus(), model.getSettlestatus()};
+        Object[] params = new Object[]{model.getOrderno(),model.getPolicyno(),model.getLicenseno(),model.getRiskcode(), model.getQuoteno(), model.getAgreeid(), model.getAgreeprodid(), model.getComlevel(), model.getComcode(), model.getKeeprate(), model.getAddrate(), model.getKeepamount(), model.getAddamount(), model.getAuditstatus(), model.getSettlestatus()};
 
         int out = jdbcTemplate.update(sql, params);
 

src/main/java/com/ydtech/modules/ins/model/InsCommission.java

@@ -1,11 +1,14 @@
 package com.ydtech.modules.ins.model;
 
+import lombok.Data;
+
 /**
  * @author qinfenglong
  * @version 1.0.0
  * @description InsCommission
  * @since 2021/1/3 20:52
  */
+@Data
 public class InsCommission {
     private String orderno;
     private String quoteno;
@@ -17,84 +20,8 @@ public class InsCommission {
     private String auditstatus;
     private String settlestatus;
     private String insuredtime;
+    private String licenseno;
+    private String policyno;
+    private String riskcode;
 
-    public String getOrderno() {
-        return orderno;
-    }
-
-    public void setOrderno(String orderno) {
-        this.orderno = orderno;
-    }
-
-    public String getQuoteno() {
-        return quoteno;
-    }
-
-    public void setQuoteno(String quoteno) {
-        this.quoteno = quoteno;
-    }
-
-    public String getRefereescode() {
-        return refereescode;
-    }
-
-    public void setRefereescode(String refereescode) {
-        this.refereescode = refereescode;
-    }
-
-    public String getRefereesname() {
-        return refereesname;
-    }
-
-    public void setRefereesname(String refereesname) {
-        this.refereesname = refereesname;
-    }
-
-    public double getCommissionrate() {
-        return commissionrate;
-    }
-
-    public void setCommissionrate(double commissionrate) {
-        this.commissionrate = commissionrate;
-    }
-
-    public double getCommissionamount() {
-        return commissionamount;
-    }
-
-    public void setCommissionamount(double commissionamount) {
-        this.commissionamount = commissionamount;
-    }
-
-    public String getLevel() {
-        return level;
-    }
-
-    public void setLevel(String level) {
-        this.level = level;
-    }
-
-    public String getAuditstatus() {
-        return auditstatus;
-    }
-
-    public void setAuditstatus(String auditstatus) {
-        this.auditstatus = auditstatus;
-    }
-
-    public String getSettlestatus() {
-        return settlestatus;
-    }
-
-    public void setSettlestatus(String settlestatus) {
-        this.settlestatus = settlestatus;
-    }
-
-    public String getInsuredtime() {
-        return insuredtime;
-    }
-
-    public void setInsuredtime(String insuredtime) {
-        this.insuredtime = insuredtime;
-    }
 }

src/main/java/com/ydtech/modules/ins/model/InsCompanyFee.java

@@ -1,11 +1,14 @@
 package com.ydtech.modules.ins.model;
 
+import lombok.Data;
+
 /**
  * @author qinfenglong
  * @version 1.0.0
  * @description InsFeeDetail
  * @since 2021/1/3 20:46
  */
+@Data
 public class InsCompanyFee {
     private String orderno;
     private double feerate;
@@ -31,196 +34,6 @@ public class InsCompanyFee {
     private String deptid;
     private String deptname;
     private String createtime;
-
-    public String getOrderno() {
-        return orderno;
-    }
-
-    public void setOrderno(String orderno) {
-        this.orderno = orderno;
-    }
-
-    public double getFeerate() {
-        return feerate;
-    }
-
-    public void setFeerate(double feerate) {
-        this.feerate = feerate;
-    }
-
-    public double getDisrate() {
-        return disrate;
-    }
-
-    public void setDisrate(double disrate) {
-        this.disrate = disrate;
-    }
-
-    public double getFeeamount() {
-        return feeamount;
-    }
-
-    public void setFeeamount(double feeamount) {
-        this.feeamount = feeamount;
-    }
-
-    public double getDisamount() {
-        return disamount;
-    }
-
-    public void setDisamount(double disamount) {
-        this.disamount = disamount;
-    }
-
-    public double getJqpremium() {
-        return jqpremium;
-    }
-
-    public void setJqpremium(double jqpremium) {
-        this.jqpremium = jqpremium;
-    }
-
-    public double getSypremium() {
-        return sypremium;
-    }
-
-    public void setSypremium(double sypremium) {
-        this.sypremium = sypremium;
-    }
-
-    public String getInscompany() {
-        return inscompany;
-    }
-
-    public void setInscompany(String inscompany) {
-        this.inscompany = inscompany;
-    }
-
-    public String getAgreeid() {
-        return agreeid;
-    }
-
-    public void setAgreeid(String agreeid) {
-        this.agreeid = agreeid;
-    }
-
-    public String getAgreementcode() {
-        return agreementcode;
-    }
-
-    public void setAgreementcode(String agreementcode) {
-        this.agreementcode = agreementcode;
-    }
-
-    public String getAgreeprodid() {
-        return agreeprodid;
-    }
-
-    public void setAgreeprodid(String agreeprodid) {
-        this.agreeprodid = agreeprodid;
-    }
-
-    public String getProducname() {
-        return producname;
-    }
-
-    public void setProducname(String producname) {
-        this.producname = producname;
-    }
-
-    public String getAgreetype() {
-        return agreetype;
-    }
-
-    public void setAgreetype(String agreetype) {
-        this.agreetype = agreetype;
-    }
-
-    public String getSettlestatus() {
-        return settlestatus;
-    }
-
-    public void setSettlestatus(String settlestatus) {
-        this.settlestatus = settlestatus;
-    }
-
-    public String getSettleno() {
-        return settleno;
-    }
-
-    public void setSettleno(String settleno) {
-        this.settleno = settleno;
-    }
-
-    public String getSettletime() {
-        return settletime;
-    }
-
-    public void setSettletime(String settletime) {
-        this.settletime = settletime;
-    }
-
-    public String getFrameNo() {
-        return frameNo;
-    }
-
-    public void setFrameNo(String frameNo) {
-        this.frameNo = frameNo;
-    }
-
-    public String getLicenseNo() {
-        return licenseNo;
-    }
-
-    public void setLicenseNo(String licenseNo) {
-        this.licenseNo = licenseNo;
-    }
-
-    public String getSettletype() {
-        return settletype;
-    }
-
-    public void setSettletype(String settletype) {
-        this.settletype = settletype;
-    }
-
-    public String getUserid() {
-        return userid;
-    }
-
-    public void setUserid(String userid) {
-        this.userid = userid;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-    public String getDeptid() {
-        return deptid;
-    }
-
-    public void setDeptid(String deptid) {
-        this.deptid = deptid;
-    }
-
-    public String getDeptname() {
-        return deptname;
-    }
-
-    public void setDeptname(String deptname) {
-        this.deptname = deptname;
-    }
-
-    public String getCreatetime() {
-        return createtime;
-    }
-
-    public void setCreatetime(String createtime) {
-        this.createtime = createtime;
-    }
+    private String policyno;
+    private String riskcode;
 }

src/main/java/com/ydtech/modules/ins/model/InsDeptFee.java

@@ -1,11 +1,14 @@
 package com.ydtech.modules.ins.model;
 
+import lombok.Data;
+
 /**
  * @author qinfenglong
  * @version 1.0.0
  * @description InsDeptFee
  * @since 2021/1/3 20:49
  */
+@Data
 public class InsDeptFee {
     private String orderno;
     private String quoteno;
@@ -20,108 +23,7 @@ public class InsDeptFee {
     private String auditstatus;
     private String settlestatus;
     private String licenseno;
+    private String policyno;
+    private String riskcode;
 
-    public String getOrderno() {
-        return orderno;
-    }
-
-    public void setOrderno(String orderno) {
-        this.orderno = orderno;
-    }
-
-    public String getQuoteno() {
-        return quoteno;
-    }
-
-    public void setQuoteno(String quoteno) {
-        this.quoteno = quoteno;
-    }
-
-    public String getAgreeid() {
-        return agreeid;
-    }
-
-    public void setAgreeid(String agreeid) {
-        this.agreeid = agreeid;
-    }
-
-    public String getAgreeprodid() {
-        return agreeprodid;
-    }
-
-    public void setAgreeprodid(String agreeprodid) {
-        this.agreeprodid = agreeprodid;
-    }
-
-    public String getComlevel() {
-        return comlevel;
-    }
-
-    public void setComlevel(String comlevel) {
-        this.comlevel = comlevel;
-    }
-
-    public String getComcode() {
-        return comcode;
-    }
-
-    public void setComcode(String comcode) {
-        this.comcode = comcode;
-    }
-
-    public double getKeeprate() {
-        return keeprate;
-    }
-
-    public void setKeeprate(double keeprate) {
-        this.keeprate = keeprate;
-    }
-
-    public double getAddrate() {
-        return addrate;
-    }
-
-    public void setAddrate(double addrate) {
-        this.addrate = addrate;
-    }
-
-    public double getKeepamount() {
-        return keepamount;
-    }
-
-    public void setKeepamount(double keepamount) {
-        this.keepamount = keepamount;
-    }
-
-    public double getAddamount() {
-        return addamount;
-    }
-
-    public void setAddamount(double addamount) {
-        this.addamount = addamount;
-    }
-
-    public String getAuditstatus() {
-        return auditstatus;
-    }
-
-    public void setAuditstatus(String auditstatus) {
-        this.auditstatus = auditstatus;
-    }
-
-    public String getSettlestatus() {
-        return settlestatus;
-    }
-
-    public void setSettlestatus(String settlestatus) {
-        this.settlestatus = settlestatus;
-    }
-
-    public String getLicenseno() {
-        return licenseno;
-    }
-
-    public void setLicenseno(String licenseno) {
-        this.licenseno = licenseno;
-    }
 }