中煤跟单费用因子存表

src/main/java/com/ydtech/modules/order/dao/InsAgreementOrderMapper.java → src/main/java/com/ydtech/modules/order/dao/InsFeeOrderMapper.java

@@ -1,7 +1,7 @@
 package com.ydtech.modules.order.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ydtech.modules.order.entity.InsAgreementOrder;
+import com.ydtech.modules.order.entity.InsFeeOrder;
 
 /**
  * @author CXP
@@ -9,7 +9,7 @@ import com.ydtech.modules.order.entity.InsAgreementOrder;
  * @createDate 2023-01-31 15:51:19
  * @Entity generator.domain.InsAgreementOrder
  */
-public interface InsAgreementOrderMapper extends BaseMapper<InsAgreementOrder> {
+public interface InsFeeOrderMapper extends BaseMapper<InsFeeOrder> {
 
 }
 

src/main/java/com/ydtech/modules/order/entity/InsAgreementOrder.java → src/main/java/com/ydtech/modules/order/entity/InsFeeOrder.java

@@ -15,13 +15,13 @@ import java.io.Serializable;
 /**
  * 订单费用跟单表
  *
- * @TableName ins_agreement_order
+ * @TableName ins_fee_order
  */
-@TableName(value = "ins_agreement_order", autoResultMap = true)
+@TableName(value = "ins_fee_order", autoResultMap = true)
 @Data
 @ApiModel(value = "报价渠道")
 @NoArgsConstructor
-public class InsAgreementOrder implements Serializable {
+public class InsFeeOrder implements Serializable {
     /**
      * 主键
      */
@@ -30,8 +30,8 @@ public class InsAgreementOrder implements Serializable {
     /**
      * 订单号
      */
-    @TableField(value = "orderno")
-    private String orderno;
+    @TableField(value = "ins_order_no")
+    private String insOrderNo;
     /**
      * 协议id
      */
@@ -41,24 +41,24 @@ public class InsAgreementOrder implements Serializable {
     /**
      * 交强险费用比例
      */
-    @TableField(value = "jqCostRate")
-    private String jqCostRate;
+    @TableField(value = "jq_costs_proportion")
+    private String jqCostsProportion;
 
     /**
      * 商业险费用比例
      */
-    @TableField(value = "syCostRate")
-    private String syCostRate;
+    @TableField(value = "sy_costs_proportion")
+    private String syCostsProportion;
 
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 
-    public InsAgreementOrder(FeeSchemeReqDto feeSchemeReqDto, FeeSchemeResDto feeSchemeResDto,String orderno) {
+    public InsFeeOrder(FeeSchemeReqDto feeSchemeReqDto, FeeSchemeResDto feeSchemeResDto,String insOrderNo) {
         this.id = IdGenerate.nextId();
-        this.orderno = orderno;
+        this.insOrderNo = insOrderNo;
         this.agreementId = feeSchemeReqDto.getAgreementId();
-        this.jqCostRate = feeSchemeResDto.getJqCostsProportion();
-        this.syCostRate = feeSchemeResDto.getSyCostsProportion();
+        this.jqCostsProportion = feeSchemeResDto.getJqCostsProportion();
+        this.syCostsProportion = feeSchemeResDto.getSyCostsProportion();
     }
 
 }

src/main/java/com/ydtech/modules/order/service/InsAgreementOrderService.java → src/main/java/com/ydtech/modules/order/service/InsFeeOrderService.java

@@ -1,14 +1,14 @@
 package com.ydtech.modules.order.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ydtech.modules.order.entity.InsAgreementOrder;
+import com.ydtech.modules.order.entity.InsFeeOrder;
 
 /**
  * @author CXP
  * @description 针对表【ins_area_company(费用跟单)】的数据库操作Service
  * @createDate 2023-9-12 21:30:24
  */
-public interface InsAgreementOrderService extends IService<InsAgreementOrder> {
+public interface InsFeeOrderService extends IService<InsFeeOrder> {
 
     /**
      * 通过子订单查询费用跟单表
@@ -16,7 +16,7 @@ public interface InsAgreementOrderService extends IService<InsAgreementOrder> {
      * @param companyId 子订单
      * @return InsAreaCompany
      */
-    InsAgreementOrder getByIdIsExist(String companyId);
+    InsFeeOrder getByIdIsExist(String companyId);
 
 
     /**
@@ -25,19 +25,19 @@ public interface InsAgreementOrderService extends IService<InsAgreementOrder> {
      * @param insOrderNo 保险公司订单号
      * @return InsAreaCompany
      */
-    InsAgreementOrder getByInsOrderNo(String insOrderNo);
+    InsFeeOrder getByInsOrderNo(String insOrderNo);
 
     /**
      * 修改费用跟单表
      *
-     * @param insAgreementOrder
+     * @param insFeeOrder
      */
-    void updateCompanyAndOrders(InsAgreementOrder insAgreementOrder);
+    void updateCompanyAndOrders(InsFeeOrder insFeeOrder);
 
     /**
      * 插入费用跟单表
      *
-     * @param insAgreementOrder
+     * @param insFeeOrder
      */
-    void insertCompanyAndOrders(InsAgreementOrder insAgreementOrder);
+    void insertCompanyAndOrders(InsFeeOrder insFeeOrder);
 }

src/main/java/com/ydtech/modules/order/service/impl/InsAgreementOrderServiceImpl.java

@@ -1,52 +0,0 @@
-package com.ydtech.modules.order.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ydtech.exception.SystemException;
-import com.ydtech.modules.order.dao.InsAgreementOrderMapper;
-import com.ydtech.modules.order.entity.InsAgreementOrder;
-import com.ydtech.modules.order.service.InsAgreementOrderService;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.ObjectUtils;
-
-/**
- * @author CXP
- * @description 针对表【ins_agreement_order(费用跟单)】的数据库操作Service实现
- * @createDate 2023-9-12 21:29:23
- */
-@Service
-public class InsAgreementOrderServiceImpl extends ServiceImpl<InsAgreementOrderMapper, InsAgreementOrder>
-        implements InsAgreementOrderService {
-
-
-    @Override
-    public InsAgreementOrder getByIdIsExist(String companyId) {
-        InsAgreementOrder insAgreementOrder = this.getById(companyId);
-        if (ObjectUtils.isEmpty(insAgreementOrder)) {
-            throw new SystemException("费用跟单表不存在");
-        }
-        return insAgreementOrder;
-    }
-
-    @Override
-    public InsAgreementOrder getByInsOrderNo(String insOrderNo) {
-        return baseMapper.selectOne(new LambdaQueryWrapper<InsAgreementOrder>().eq(InsAgreementOrder::getOrderno, insOrderNo));
-    }
-
-    @Override
-    @Transactional
-    public void updateCompanyAndOrders(InsAgreementOrder insAreaCompany) {
-        baseMapper.updateById(insAreaCompany);
-    }
-
-    @Override
-    public void insertCompanyAndOrders(InsAgreementOrder insAreaCompany) {
-        baseMapper.insert(insAreaCompany);
-    }
-
-}
-
-
-
-

src/main/java/com/ydtech/modules/order/service/impl/InsFeeOrderServiceImpl.java

@@ -0,0 +1,52 @@
+package com.ydtech.modules.order.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ydtech.exception.SystemException;
+import com.ydtech.modules.order.dao.InsFeeOrderMapper;
+import com.ydtech.modules.order.entity.InsFeeOrder;
+import com.ydtech.modules.order.service.InsFeeOrderService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
+
+/**
+ * @author CXP
+ * @description 针对表【ins_agreement_order(费用跟单)】的数据库操作Service实现
+ * @createDate 2023-9-12 21:29:23
+ */
+@Service
+public class InsFeeOrderServiceImpl extends ServiceImpl<InsFeeOrderMapper, InsFeeOrder>
+        implements InsFeeOrderService {
+
+
+    @Override
+    public InsFeeOrder getByIdIsExist(String companyId) {
+        InsFeeOrder insAgreementOrder = this.getById(companyId);
+        if (ObjectUtils.isEmpty(insAgreementOrder)) {
+            throw new SystemException("费用跟单表不存在");
+        }
+        return insAgreementOrder;
+    }
+
+    @Override
+    public InsFeeOrder getByInsOrderNo(String insOrderNo) {
+        return baseMapper.selectOne(new LambdaQueryWrapper<InsFeeOrder>().eq(InsFeeOrder::getInsOrderNo, insOrderNo));
+    }
+
+    @Override
+    @Transactional
+    public void updateCompanyAndOrders(InsFeeOrder insFeeOrder) {
+        baseMapper.updateById(insFeeOrder);
+    }
+
+    @Override
+    public void insertCompanyAndOrders(InsFeeOrder insFeeOrder) {
+        baseMapper.insert(insFeeOrder);
+    }
+
+}
+
+
+
+

src/main/java/com/ydtech/modules/order/service/impl/ZhongMeiOrderApiServiceImpl.java

@@ -19,8 +19,8 @@ import com.ydtech.modules.order.components.ConfigureParametersComponents;
 import com.ydtech.modules.order.components.ZhongmeiRequestApiComponents;
 import com.ydtech.modules.order.constants.InsuranceTypeCorrespondence;
 import com.ydtech.modules.order.convert.SimpleStadarCarDTOConvert;
-import com.ydtech.modules.order.entity.InsAgreementOrder;
 import com.ydtech.modules.order.entity.InsAreaCompany;
+import com.ydtech.modules.order.entity.InsFeeOrder;
 import com.ydtech.modules.order.entity.InsOrders;
 import com.ydtech.modules.order.entity.TaxArrears;
 import com.ydtech.modules.order.entity.api.zm.BaseRequestHead;
@@ -42,7 +42,6 @@ import com.ydtech.modules.protocol.entity.po.PtlAgreementAttribution;
 import com.ydtech.modules.protocol.service.PtlAgreementAttributionService;
 import com.ydtech.utils.CalculateUtils;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
@@ -71,12 +70,12 @@ public class ZhongMeiOrderApiServiceImpl implements ZhongMeiOrderApiService {
 
     private final FeeRuleSchemeService feeRuleSchemeService;
 
-    private final InsAgreementOrderService insAgreementOrderService;
+    private final InsFeeOrderService insFeeOrderService;
 
     public ZhongMeiOrderApiServiceImpl(InsOrdersService insOrdersService, InsAreaCompanyService insAreaCompanyService, InsTaskImagesService insTaskImagesService,
                                        ZhongmeiRequestApiComponents zhongmeiRequestApiComponents, ZhongmeiRequestComponents zhongmeiRequestComponents,
                                        ConfigureParametersComponents configureParametersComponents, PtlAgreementAttributionService ptlAgreementAttributionService,
-                                       FeeRuleSchemeService feeRuleSchemeService,InsAgreementOrderService insAgreementOrderService) {
+                                       FeeRuleSchemeService feeRuleSchemeService, InsFeeOrderService insFeeOrderService) {
         this.insOrdersService = insOrdersService;
         this.insAreaCompanyService = insAreaCompanyService;
         this.insTaskImagesService = insTaskImagesService;
@@ -85,7 +84,7 @@ public class ZhongMeiOrderApiServiceImpl implements ZhongMeiOrderApiService {
         this.configureParametersComponents = configureParametersComponents;
         this.ptlAgreementAttributionService = ptlAgreementAttributionService;
         this.feeRuleSchemeService = feeRuleSchemeService;
-        this.insAgreementOrderService = insAgreementOrderService;
+        this.insFeeOrderService = insFeeOrderService;
     }
 
     private void modelInquiry(String modelName, List<ModelsQueryResponse.SimpleStadarCarDTO> simpleStadarCarDTOS) {
@@ -154,14 +153,14 @@ public class ZhongMeiOrderApiServiceImpl implements ZhongMeiOrderApiService {
         QuoteRespVo quoteRespVo = getQuoteRespVo(quotedPriceResponse, quoteInfo);
 
         //这里调用费用匹配功能
-        /*InsOrders insOrders = insOrdersService.getById(quoteRespVo.getOrderno());
+       /* InsOrders insOrders = insOrdersService.getById(quoteRespVo.getOrderno());
         FeeSchemeReqDto feeSchemeReqDto = feeRuleSchemeService.getFeeSchemeInfo(quoteInfo,quoteRespVo,ptlAgreementAttribution.getId(),insOrders.getProductid());
        // FeeSchemeResDto feeSchemeResDto = feeRuleSchemeService.matchTheAppropriateFees(feeSchemeReqDto);
         FeeSchemeResDto feeSchemeResDto = new FeeSchemeResDto();
         feeSchemeResDto.setJqCostsProportion("50");
         feeSchemeResDto.setSyCostsProportion("55");
-        InsAgreementOrder insAgreementOrder = new InsAgreementOrder(feeSchemeReqDto,feeSchemeResDto,quotedPriceResponse.getBusinessNo());
-        insAgreementOrderService.insertCompanyAndOrders(insAgreementOrder);*/
+        InsFeeOrder insFeeOrder = new InsFeeOrder(feeSchemeReqDto,feeSchemeResDto,quotedPriceResponse.getBusinessNo());
+        insFeeOrderService.insertCompanyAndOrders(insFeeOrder);*/
         return responseOrder(quotedPriceResponse, quoteRespVo, ptlAgreementAttribution);
     }
 

src/main/java/com/ydtech/modules/order/service/impl/ZhongMeiOrderServiceImpl.java

@@ -25,8 +25,8 @@ import com.ydtech.modules.ins.model.vo.res.ZmVerifyPaymentVo;
 import com.ydtech.modules.ins.model.ya.CarModelDTO;
 import com.ydtech.modules.ins.model.ya.YaQuoteInfoVo;
 import com.ydtech.modules.ins.model.zm.ZmCarModel;
-import com.ydtech.modules.order.entity.InsAgreementOrder;
 import com.ydtech.modules.order.entity.InsAreaCompany;
+import com.ydtech.modules.order.entity.InsFeeOrder;
 import com.ydtech.modules.order.entity.InsOrders;
 import com.ydtech.modules.order.entity.TaxArrears;
 import com.ydtech.modules.order.entity.request.ZmRequestParameter;
@@ -114,10 +114,10 @@ public class ZhongMeiOrderServiceImpl implements ZhongMeiOrderService {
         QuoteRespVo quoteRespVo = getQuoteRespVo(orderNo, data, quoteInfoVo);
 
         //这里调用费用匹配功能
-        //InsOrders insOrders = insOrdersService.getById(quoteRespVo.getOrderno());
-        //FeeSchemeReqDto feeSchemeReqDto = feeRuleSchemeService.getFeeSchemeInfo(quoteInfoVo,quoteRespVo,quoteVo.getAgreementId(),insOrders.getProductid());
-        //FeeSchemeResDto feeSchemeResDto = feeRuleSchemeService.matchTheAppropriateFees(feeSchemeReqDto);
-        //InsAgreementOrder insAgreementOrder = new InsAgreementOrder(feeSchemeReqDto,feeSchemeResDto,orderNo);
+        /*InsOrders insOrders = insOrdersService.getById(quoteRespVo.getOrderno());
+        FeeSchemeReqDto feeSchemeReqDto = feeRuleSchemeService.getFeeSchemeInfo(quoteInfoVo,quoteRespVo,quoteVo.getAgreementId(),insOrders.getProductid());
+        FeeSchemeResDto feeSchemeResDto = feeRuleSchemeService.matchTheAppropriateFees(feeSchemeReqDto);
+        InsFeeOrder insFeeOrder = new InsFeeOrder(feeSchemeReqDto,feeSchemeResDto,orderNo);*/
         // 4.插入订单
         return responseOrder(orderNo, esmInsAttribution.getId(), body, quoteRespVo, esmInsCompany);
     }

src/main/resources/mapper/modules/order/InsAgreementOrder.xml

@@ -1,20 +0,0 @@
-<?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.order.dao.InsAgreementOrderMapper">
-
-    <resultMap id="BaseResultMap" type="com.ydtech.modules.order.entity.InsAgreementOrder">
-        <id property="id" column="id" jdbcType="VARCHAR"/>
-        <result property="orderno" column="orderno" jdbcType="VARCHAR"/>
-        <result property="agreementId" column="agreement_id" jdbcType="VARCHAR"/>
-        <result property="jqCostRate" column="jqCostRate" jdbcType="VARCHAR"/>
-        <result property="syCostRate" column="syCostRate" jdbcType="VARCHAR"/>
-
-    </resultMap>
-
-    <sql id="Base_Column_List">
-        id,orderno,agreementId,jqCostRate,syCostRate
-    </sql>
-
-</mapper>

src/main/resources/mapper/modules/order/InsFeeOrder.xml

@@ -0,0 +1,20 @@
+<?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.order.dao.InsFeeOrderMapper">
+
+    <resultMap id="BaseResultMap" type="com.ydtech.modules.order.entity.InsFeeOrder">
+        <id property="id" column="id" jdbcType="VARCHAR"/>
+        <result property="insOrderNo" column="ins_order_no" jdbcType="VARCHAR"/>
+        <result property="agreementId" column="agreement_id" jdbcType="VARCHAR"/>
+        <result property="jqCostsProportion" column="jq_costs_proportion" jdbcType="VARCHAR"/>
+        <result property="syCostsProportion" column="sy_costs_proportion" jdbcType="VARCHAR"/>
+
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,orderno,agreementId,jqPolicyNo,syPolicyNo,jqCostsProportion,syCostsProportion
+    </sql>
+
+</mapper>