外部订单修改

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

@@ -53,6 +53,7 @@ import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -824,6 +825,8 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
         } else {
             //状态码为已审核且数据不为空,则更新审核状态
             insFeeAudit.setAuditstatus(auditstatus);
+            insFeeAudit.setAudituser(BaseController.getUser().getName());
+            insFeeAudit.setAudittime(LocalDateTime.now());
             insFeeAudit.setRejectinfo(rejectInfo);
             this.update(insFeeAudit, new LambdaUpdateWrapper<InsFeeAudit>().eq(InsFeeAudit::getOrderno, orderNo));
         }

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

@@ -453,6 +453,12 @@ public class InsAreaCompany implements Serializable {
     @TableField("problem_order")
     private String problemOrder;
 
+    @TableField(exist = false)
+    private String licenseno;
+
+    @TableField(exist = false)
+    private String rejectinfo;
+
     /**
      * 非车信息
      */

src/main/java/com/ydtech/modules/order/entity/InsAreaCompanyExternalFee.java

@@ -67,23 +67,23 @@ public class InsAreaCompanyExternalFee implements Serializable {
     }
 
     public BigDecimal getJqOtherCostsProportion() {
-        return jqOtherCostsProportion == null ? BigDecimal.ZERO : jqSuperviseCostsProportion;
+        return jqOtherCostsProportion == null ? BigDecimal.ZERO : jqOtherCostsProportion;
     }
 
     public BigDecimal getSySuperviseCostsProportion() {
-        return sySuperviseCostsProportion == null ? BigDecimal.ZERO : jqSuperviseCostsProportion;
+        return sySuperviseCostsProportion == null ? BigDecimal.ZERO : sySuperviseCostsProportion;
     }
 
     public BigDecimal getSyOtherCostsProportion() {
-        return syOtherCostsProportion == null ? BigDecimal.ZERO : jqSuperviseCostsProportion;
+        return syOtherCostsProportion == null ? BigDecimal.ZERO : syOtherCostsProportion;
     }
 
     public BigDecimal getNoSuperviseCostsProportion() {
-        return noSuperviseCostsProportion == null ? BigDecimal.ZERO : jqSuperviseCostsProportion;
+        return noSuperviseCostsProportion == null ? BigDecimal.ZERO : noSuperviseCostsProportion;
     }
 
     public BigDecimal getNoOtherCostsProportion() {
-        return noOtherCostsProportion == null ? BigDecimal.ZERO : jqSuperviseCostsProportion;
+        return noOtherCostsProportion == null ? BigDecimal.ZERO : noOtherCostsProportion;
     }
 
 }

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

@@ -705,16 +705,16 @@ public class InsAreaCompanyServiceImpl extends ServiceImpl<InsAreaCompanyMapper,
         //处理保单
         InsAreaCompanyExternalPolicy externalPolicy = new InsAreaCompanyExternalPolicy();
         externalPolicy.setSubOrderNo(subOrderNo);
-        if(!insOrdersEditingVo.getJqPolicyList().isEmpty()){
+        if(insOrdersEditingVo.getJqPolicyList() != null && !insOrdersEditingVo.getJqPolicyList().isEmpty()){
             externalPolicy.setJqPolicy(insOrdersEditingVo.getJqPolicyList().get(0).getUrl());
         }
-        if(!insOrdersEditingVo.getSyPolicyList().isEmpty()){
+        if(insOrdersEditingVo.getSyPolicyList() != null && !insOrdersEditingVo.getSyPolicyList().isEmpty()){
             externalPolicy.setSyPolicy(insOrdersEditingVo.getSyPolicyList().get(0).getUrl());
         }
-        if(!insOrdersEditingVo.getNoPolicyList().isEmpty()){
+        if(insOrdersEditingVo.getNoPolicyList() != null && !insOrdersEditingVo.getNoPolicyList().isEmpty()){
             externalPolicy.setNoPolicy(insOrdersEditingVo.getNoPolicyList().get(0).getUrl());
         }
-        if(!insOrdersEditingVo.getJqSignList().isEmpty()){
+        if(insOrdersEditingVo.getJqSignList() != null && !insOrdersEditingVo.getJqSignList().isEmpty()){
             externalPolicy.setJqSign(insOrdersEditingVo.getJqSignList().get(0).getUrl());
         }
         insAreaCompanyExternalPolicyService.updateById(externalPolicy);
@@ -785,12 +785,6 @@ public class InsAreaCompanyServiceImpl extends ServiceImpl<InsAreaCompanyMapper,
                 insAreaCompanyExternalFee.setNoOtherCostsProportion(insOrdersEditingVo.getNoCostsProportion().subtract(noSuperviseCostsProportion));
             }
         }
-        insAreaCompanyExternalFee.setJqSuperviseCostsProportion(insAreaCompanyExternalFee.getJqSuperviseCostsProportion()!=null ? insAreaCompanyExternalFee.getJqSuperviseCostsProportion() : new BigDecimal(0));
-        insAreaCompanyExternalFee.setJqOtherCostsProportion(insAreaCompanyExternalFee.getJqOtherCostsProportion()!=null ? insAreaCompanyExternalFee.getJqOtherCostsProportion() : new BigDecimal(0));
-        insAreaCompanyExternalFee.setSySuperviseCostsProportion(insAreaCompanyExternalFee.getSySuperviseCostsProportion()!=null ? insAreaCompanyExternalFee.getSySuperviseCostsProportion() : new BigDecimal(0));
-        insAreaCompanyExternalFee.setSyOtherCostsProportion(insAreaCompanyExternalFee.getSyOtherCostsProportion()!=null ? insAreaCompanyExternalFee.getSyOtherCostsProportion() : new BigDecimal(0));
-        insAreaCompanyExternalFee.setNoSuperviseCostsProportion(insAreaCompanyExternalFee.getNoSuperviseCostsProportion()!=null ? insAreaCompanyExternalFee.getNoSuperviseCostsProportion() : new BigDecimal(0));
-        insAreaCompanyExternalFee.setNoOtherCostsProportion(insAreaCompanyExternalFee.getNoOtherCostsProportion()!=null ? insAreaCompanyExternalFee.getNoOtherCostsProportion() : new BigDecimal(0));
         insAreaCompanyExternalFeeService.updateById(insAreaCompanyExternalFee);
 
 

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

@@ -654,11 +654,24 @@
 
     <select id="getRejectOrder" resultType="com.ydtech.modules.order.entity.InsAreaCompany">
         select
-            *
+            iac.id,
+            iac.orderno,
+            iac.agreement_id,
+            iac.jqpremium,
+            iac.sypremium,
+            iac.jypremium,
+            iac.taxamount,
+            iac.sumpremium,
+            io.licenseno,
+            ifa.audittime,
+            ifa.audituser as auditname,
+            ifa.rejectinfo
         FROM
             ins_fee_audit ifa
         LEFT JOIN
             ins_area_company iac on iac.id = ifa.ins_order_no
+        LEFT JOIN
+            ins_orders io on iac.orderno = io.orderno
         WHERE
             iac.operator_id = #{userId}
         AND