Merge remote-tracking branch 'origin/test' into test

src/main/java/com/ydtech/modules/fnc/service/InsFeeAuditService.java

@@ -27,4 +27,9 @@ public interface InsFeeAuditService extends IService<InsFeeAudit> {
      InsFeeAudit saveInsFeeAuditAndHistory(String orderNo, String insOrderNo, boolean isAutoAudit, String auditstatus);
 
 
+     InsFeeAudit saveDefaultInsFeeAuditAndHistory(String orderNo, String insOrderNo, String auditstatus);
+
+
+
+
 }

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

@@ -779,4 +779,39 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
 
         return insFeeAudit;
     }
+
+    @Override
+    public InsFeeAudit saveDefaultInsFeeAuditAndHistory(String orderNo, String insOrderNo, String auditstatus) {
+        //查询费用审核表
+        InsFeeAudit insFeeAudit = getOne(new LambdaQueryWrapper<InsFeeAudit>().eq(InsFeeAudit::getOrderno, orderNo));
+
+        //添加审核轨迹表
+        InsFeeAuditHistory insFeeAuditHistory = new InsFeeAuditHistory();
+        if (insFeeAudit == null) {
+            insFeeAudit = new InsFeeAudit();
+            // 设置订单号和保险订单号
+            insFeeAudit.setOrderno(orderNo);
+            insFeeAudit.setInsOrderNo(insOrderNo);
+            insFeeAudit.setAuditstatus(auditstatus);
+            this.save(insFeeAudit);
+        } else {
+            //状态码为已审核且数据不为空,则更新审核状态
+            insFeeAudit.setAuditstatus(auditstatus);
+            this.update(insFeeAudit, new LambdaUpdateWrapper<InsFeeAudit>().eq(InsFeeAudit::getOrderno, orderNo));
+        }
+        //复制审核对象的属性
+        BeanUtils.copyProperties(insFeeAudit, insFeeAuditHistory);
+
+        InsAreaCompany insAreaCompany = insAreaCompanyMapper.selectById(insFeeAudit.getInsOrderNo());
+
+        // 设置操作时间和操作人及保险公司名称
+        insFeeAuditHistory.setInsCompany(insAreaCompany.getInscompany());
+        insFeeAuditHistory.setOperatorTime(LocalDateTime.now());
+        insFeeAuditHistory.setOperator(BaseController.getUser().getName());
+
+        // 保存审核轨迹
+        insFeeAuditHistoryService.save(insFeeAuditHistory);
+
+        return insFeeAudit;
+    }
 }

src/main/java/com/ydtech/modules/ins/model/guoren/NonAutoInsOrderReq.java

@@ -406,7 +406,7 @@ public class NonAutoInsOrderReq {
                     this.licenseNo = carInfo.getLicenseNo();
                     this.planNo = "1";
                     this.purchasePrice = Double.valueOf(vinQ.getPriceShow());
-                    this.seatNum = Integer.valueOf(vinQ.getSeatCountBC());
+                    this.seatNum = Float.valueOf(vinQ.getSeatCountBC()).intValue();
                     this.toncount = Double.valueOf(vinQ.getTonCount());
                 }
 

src/main/java/com/ydtech/modules/order/controller/InsOrdersController.java

@@ -14,12 +14,10 @@ import com.ydtech.modules.base.model.dto.PageDto;
 import com.ydtech.modules.ins.model.InsOrdersExcelVo;
 import com.ydtech.modules.order.components.InsOrdersComponents;
 import com.ydtech.modules.order.constants.OrderLinkTypeConstants;
-import com.ydtech.modules.order.entity.BasePageResult;
-import com.ydtech.modules.order.entity.InsAccidentalDriving;
-import com.ydtech.modules.order.entity.InsAreaCompany;
-import com.ydtech.modules.order.entity.InsOrders;
+import com.ydtech.modules.order.entity.*;
 import com.ydtech.modules.order.entity.dto.InsAreaCompanyQueryDto;
 import com.ydtech.modules.order.entity.vo.*;
+import com.ydtech.modules.order.service.BatchOrderService;
 import com.ydtech.modules.order.service.InsAccidentalDrivingService;
 import com.ydtech.modules.order.service.InsAreaCompanyService;
 import com.ydtech.modules.order.service.InsOrdersService;
@@ -54,14 +52,17 @@ public class InsOrdersController extends BaseController {
 
     private final SysUserIsDialService sysUserIsDialService;
 
+    private final BatchOrderService batchOrderService;
+
     public InsOrdersController(InsAreaCompanyService insAreaCompanyService, InsOrdersService insOrdersService,
                                InsOrdersComponents insOrdersComponents, InsAccidentalDrivingService insAccidentalDrivingService,
-                               SysUserIsDialService sysUserIsDialService) {
+                               SysUserIsDialService sysUserIsDialService, BatchOrderService batchOrderService) {
         this.insAreaCompanyService = insAreaCompanyService;
         this.insOrdersService = insOrdersService;
         this.insOrdersComponents = insOrdersComponents;
         this.insAccidentalDrivingService = insAccidentalDrivingService;
         this.sysUserIsDialService = sysUserIsDialService;
+        this.batchOrderService = batchOrderService;
     }
 
     @GetMapping("/getAgreementInsCompany")
@@ -334,4 +335,58 @@ public class InsOrdersController extends BaseController {
         orderExpirationQueryVo.setUserid(getUserId());
         return HttpResult.ok(insOrdersService.getExpirationInsureCount(orderExpirationQueryVo));
     }
+
+    /**
+     * 批单操作
+     * @param batchOrderVo
+     * @return
+     */
+    @PostMapping("/batchOrder")
+    @ApiOperation(value = "批单")
+    public HttpResult batchOrder(@RequestBody BatchOrderVo batchOrderVo){
+        boolean result = batchOrderService.batchOrder(batchOrderVo);
+        if(result){
+            return HttpResult.ok("批单修改成功，等待审核");
+        }else{
+            return HttpResult.error("批单修改失败");
+        }
+    }
+
+    /**
+     * 获取批单信息
+     * @param subOrderNo
+     * @return
+     */
+    @GetMapping("/getBatchOrder")
+    @ApiOperation(value = "获取批单信息")
+    public HttpResult getBatchOrder(String subOrderNo){
+        BatchOrder batchOrderBySubOrderNo = batchOrderService.getBatchOrderBySubOrderNo(subOrderNo);
+        if(batchOrderBySubOrderNo != null){
+            return HttpResult.ok(batchOrderBySubOrderNo);
+        }else{
+            return HttpResult.error("获取批单失败");
+        }
+    }
+
+    @PostMapping("/getBatchOrderList")
+    @ApiOperation(value = "获取批单列表")
+    public HttpResult getBatchOrderList(@RequestBody BatchOrderQueryVo batchOrderQueryVo){
+        Page page = buildPageRequest(batchOrderQueryVo.getPageDto());
+        if(batchOrderQueryVo.getIsAudit() == null){
+            batchOrderQueryVo.setIsAudit(0);
+        }
+        return HttpResult.ok(batchOrderService.getBatchOrderList(page,batchOrderQueryVo));
+
+    }
+
+    @PostMapping("/auditBatchOrder")
+    @ApiOperation(value = "批单审核")
+    public HttpResult auditBatchOrder(@RequestBody BatchOrderAuditVo batchOrderAuditVo){
+        boolean result = batchOrderService.auditBatchOrder(batchOrderAuditVo);
+        if(result){
+            return HttpResult.ok("批单审核成功");
+        }else{
+            return HttpResult.error("批单审核失败");
+        }
+    }
 }

src/main/java/com/ydtech/modules/order/dao/BatchOrderMapper.java

@@ -0,0 +1,15 @@
+package com.ydtech.modules.order.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ydtech.modules.order.entity.BatchOrder;
+import com.ydtech.modules.order.entity.vo.dajia.InsAccidentalDrivingDajia;
+
+/**
+ * @author Administrator
+ * @description 针对表【batchOrder(批单)】的数据库操作Mapper
+ * @createDate 2024-6-5 16:19:14
+ * @Entity generator.domain.InsAccidentalDriving
+ */
+public interface BatchOrderMapper extends BaseMapper<BatchOrder> {
+
+}

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

@@ -0,0 +1,95 @@
+package com.ydtech.modules.order.entity;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
+import com.ydtech.modules.order.entity.vo.BatchOrderVo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.joda.time.DateTime;
+
+import java.time.LocalDateTime;
+
+
+@TableName("ins_orders_batch")
+@Data
+public class BatchOrder {
+
+    @TableId(value = "id")
+    private String id;
+
+    /**
+     * 订单号
+     */
+    @ApiModelProperty("订单号")
+    @TableField(value = "sub_order_no")
+    private String subOrderNo;
+
+    @ApiModelProperty("车辆信息")
+    @TableField(value = "carinfo",typeHandler = FastjsonTypeHandler.class)
+    private JSONObject carInfo;
+
+    @ApiModelProperty("车主信息")
+    @TableField(value = "ownerinfo",typeHandler = FastjsonTypeHandler.class)
+    private JSONObject ownerInfo;
+
+    @ApiModelProperty("投保人信息")
+    @TableField(value = "applyinfo",typeHandler = FastjsonTypeHandler.class)
+    private JSONObject applyInfo;
+
+    @ApiModelProperty("被保人信息")
+    @TableField(value = "insureinfo",typeHandler = FastjsonTypeHandler.class)
+    private JSONObject insureInfo;
+
+    @ApiModelProperty("修改内容")
+    @TableField(value = "modify_content")
+    private String modifyContent;
+
+    @ApiModelProperty("是否审核")
+    @TableField(value = "is_audit")
+    private Integer isAudit;
+
+    @ApiModelProperty("驳回原因")
+    @TableField(value = "reject_reason")
+    private String rejectReason;
+
+    @ApiModelProperty("审核时间")
+    @TableField(value = "audit_time")
+    private LocalDateTime auditTime;
+
+    @ApiModelProperty("审核人")
+    @TableField(value = "audit_user")
+    private String auditUser;
+
+
+    public BatchOrder(){
+
+    }
+
+    public void setCarInfo(String carInfo) {
+        this.carInfo = JSONObject.parseObject(carInfo);
+    }
+
+    public void setOwnerInfo(String ownerInfo) {
+        this.ownerInfo = JSONObject.parseObject(ownerInfo);
+    }
+
+    public void setApplyInfo(String applyInfo) {
+        this.applyInfo = JSONObject.parseObject(applyInfo);
+    }
+
+    public void setInsureInfo(String insureInfo) {
+        this.insureInfo = JSONObject.parseObject(insureInfo);
+    }
+
+    public BatchOrder(BatchOrderVo batchOrderVo) {
+        this.subOrderNo = batchOrderVo.getSubOrderNo();
+        this.carInfo = batchOrderVo.getCarInfo();
+        this.ownerInfo = batchOrderVo.getOwnerInfo();
+        this.applyInfo = batchOrderVo.getApplyInfo();
+        this.insureInfo = batchOrderVo.getInsureInfo();
+    }
+}

src/main/java/com/ydtech/modules/order/entity/vo/BatchOrderAuditVo.java

@@ -0,0 +1,21 @@
+package com.ydtech.modules.order.entity.vo;
+
+
+import com.alibaba.fastjson.JSONObject;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "批单审核实体")
+public class BatchOrderAuditVo {
+
+    @ApiModelProperty("订单号")
+    private String orderNo;
+
+    @ApiModelProperty("是否审核")
+    private Integer isAudit;
+
+    @ApiModelProperty("驳回原因")
+    private String rejectReason;
+}

src/main/java/com/ydtech/modules/order/entity/vo/BatchOrderQueryVo.java

@@ -0,0 +1,29 @@
+package com.ydtech.modules.order.entity.vo;
+
+
+import com.ydtech.core.page.PageRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "批单列表实体")
+public class BatchOrderQueryVo extends PageRequest {
+
+    @ApiModelProperty("订单号")
+    private String orderNo;
+
+    @ApiModelProperty("审核状态")
+    private Integer isAudit;
+
+    @ApiModelProperty("车牌号")
+    private String licenseNo;
+
+    @ApiModelProperty("车辆识别代码")
+    private String frameNo;
+
+    @ApiModelProperty("发动机号")
+    private String engineNo;
+
+
+}

src/main/java/com/ydtech/modules/order/entity/vo/BatchOrderVo.java

@@ -0,0 +1,28 @@
+package com.ydtech.modules.order.entity.vo;
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "批单实体")
+public class BatchOrderVo {
+
+    @ApiModelProperty("子订单号")
+    private String subOrderNo;
+
+    @ApiModelProperty("车辆信息")
+    private JSONObject carInfo;
+
+    @ApiModelProperty("车主信息")
+    private JSONObject ownerInfo;
+
+    @ApiModelProperty("投保人信息")
+    private JSONObject applyInfo;
+
+    @ApiModelProperty("被保人信息")
+    private JSONObject insureInfo;
+}

src/main/java/com/ydtech/modules/order/service/BatchOrderService.java

@@ -0,0 +1,43 @@
+package com.ydtech.modules.order.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ydtech.core.page.HttpResult;
+import com.ydtech.modules.ins.model.vo.QuoteRespVo;
+import com.ydtech.modules.order.entity.BatchOrder;
+import com.ydtech.modules.order.entity.vo.*;
+
+import java.util.List;
+
+/**
+ * 批单服务
+ */
+public interface BatchOrderService {
+
+    /**
+     * 批单
+     * @param batchOrderVo
+     * @return
+     */
+    boolean batchOrder(BatchOrderVo batchOrderVo);
+
+    /**
+     * 批单审核
+     * @param batchOrderAuditVo
+     * @return
+     */
+    boolean auditBatchOrder(BatchOrderAuditVo batchOrderAuditVo);
+
+    /**
+     * 根据子订单id获取批单信息
+     * @param subOrderNo
+     * @return
+     */
+    BatchOrder getBatchOrderBySubOrderNo(String subOrderNo);
+
+    /**
+     * 获取批单列表
+     * @param batchOrderQueryVo
+     * @return
+     */
+    Page<BatchOrder> getBatchOrderList(Page page, BatchOrderQueryVo batchOrderQueryVo);
+}

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

@@ -0,0 +1,165 @@
+package com.ydtech.modules.order.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ydtech.exception.SystemException;
+import com.ydtech.modules.base.controller.BaseController;
+import com.ydtech.modules.order.dao.BatchOrderMapper;
+import com.ydtech.modules.order.entity.BatchOrder;
+import com.ydtech.modules.order.entity.InsAreaCompany;
+import com.ydtech.modules.order.entity.InsOrders;
+import com.ydtech.modules.order.entity.vo.BatchOrderAuditVo;
+import com.ydtech.modules.order.entity.vo.BatchOrderQueryVo;
+import com.ydtech.modules.order.entity.vo.BatchOrderVo;
+import com.ydtech.modules.order.service.BatchOrderService;
+import com.ydtech.modules.order.service.InsAreaCompanyService;
+import com.ydtech.modules.order.service.InsOrdersService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDateTime;
+import java.util.Objects;
+
+@Service
+public class BatchOrderServiceImpl extends ServiceImpl<BatchOrderMapper, BatchOrder> implements BatchOrderService {
+
+    @Autowired
+    private InsOrdersService insOrdersService;
+
+    @Autowired
+    private InsAreaCompanyService insAreaCompanyService;
+
+    /**
+     * 批单
+     * @param batchOrderVo
+     * @return
+     */
+    public boolean batchOrder(BatchOrderVo batchOrderVo){
+        String subOrderNo = batchOrderVo.getSubOrderNo();
+        BatchOrder batchOrderOne = baseMapper.selectOne(new LambdaQueryWrapper<>(BatchOrder.class)
+                .eq(BatchOrder::getSubOrderNo, subOrderNo)
+                .eq(BatchOrder::getIsAudit, 0));
+        if(batchOrderOne != null){
+            throw new SystemException("该订单已经批单待审核，请勿重复操作");
+        }
+        InsAreaCompany insAreaCompany = insAreaCompanyService.getById(batchOrderVo.getSubOrderNo());
+        InsOrders insOrders = insOrdersService.getById(insAreaCompany.getOrderno());
+        if (insOrders == null) {
+            return false;
+        }
+        if(batchOrderVo.getOwnerInfo().getString("mobile").contains("*")){
+            batchOrderVo.getOwnerInfo().put("mobile", insOrders.getOwnerinfo().getString("mobile"));
+        }
+        if(batchOrderVo.getApplyInfo().getString("mobile").contains("*")){
+            batchOrderVo.getApplyInfo().put("mobile", insOrders.getApplyinfo().getString("mobile"));
+        }
+        if(batchOrderVo.getInsureInfo().getString("mobile").contains("*")){
+            batchOrderVo.getInsureInfo().put("mobile", insOrders.getInsureinfo().getString("mobile"));
+        }
+        StringBuilder modifyContent  = new StringBuilder();
+        JSONObject carinfo = insOrders.getCarinfo();
+        JSONObject ownerinfo = insOrders.getOwnerinfo();
+        JSONObject applyinfo = insOrders.getApplyinfo();
+        JSONObject insureinfo = insOrders.getInsureinfo();
+        for(String key : carinfo.keySet()){
+            if(!batchOrderVo.getCarInfo().getString(key).equals(carinfo.getString(key))){
+                modifyContent.append("车辆信息：").append(key).append("由").append(carinfo.getString(key)).append("修改为").append(batchOrderVo.getCarInfo().getString(key)).append(";");
+            }
+        }
+        for(String key : ownerinfo.keySet()){
+            if(!batchOrderVo.getOwnerInfo().getString(key).equals(ownerinfo.getString(key))){
+                modifyContent.append("车主信息：").append(key).append("由").append(ownerinfo.getString(key)).append("修改为").append(batchOrderVo.getOwnerInfo().getString(key)).append(";");
+            }
+        }
+        for(String key : applyinfo.keySet()){
+            if(!batchOrderVo.getApplyInfo().getString(key).equals(applyinfo.getString(key))){
+                modifyContent.append("投保人信息：").append(key).append("由").append(applyinfo.getString(key)).append("修改为").append(batchOrderVo.getApplyInfo().getString(key)).append(";");
+            }
+        }
+        for(String key : insureinfo.keySet()){
+            if(!batchOrderVo.getInsureInfo().getString(key).equals(insureinfo.getString(key))){
+                modifyContent.append("被保人信息：").append(key).append("由").append(insureinfo.getString(key)).append("修改为").append(batchOrderVo.getInsureInfo().getString(key)).append(";");
+            }
+        }
+        BatchOrder  batchOrder = new BatchOrder(batchOrderVo);
+        batchOrder.setModifyContent(modifyContent.toString());
+        return this.save(batchOrder);
+    }
+
+    /**
+     * 根据子订单id获取批单信息
+     * @param subOrderNo
+     * @return
+     */
+    public BatchOrder getBatchOrderBySubOrderNo(String subOrderNo){
+        BatchOrder batchOrder = baseMapper.selectOne(new LambdaQueryWrapper<BatchOrder>()
+                .eq(BatchOrder::getSubOrderNo, subOrderNo));
+        return batchOrder;
+    }
+
+    /**
+     * 获取批单列表
+     * @param batchOrderQueryVo
+     * @return
+     */
+    @Override
+    public Page<BatchOrder> getBatchOrderList(Page page, BatchOrderQueryVo batchOrderQueryVo) {
+        LambdaQueryWrapper<BatchOrder> queryWrapper = new LambdaQueryWrapper<BatchOrder>().eq(BatchOrder::getIsAudit, batchOrderQueryVo.getIsAudit());
+        if(batchOrderQueryVo.getLicenseNo() != null){
+            queryWrapper.apply("JSON_EXTRACT(carinfo, '$.licenseNo') = '"+batchOrderQueryVo.getLicenseNo()+"'");
+        }
+        if(batchOrderQueryVo.getFrameNo() != null){
+            queryWrapper.apply("JSON_EXTRACT(carinfo, '$.frameNo') = '"+batchOrderQueryVo.getFrameNo()+"'");
+        }
+        if(batchOrderQueryVo.getEngineNo() != null){
+            queryWrapper.apply("JSON_EXTRACT(carinfo, '$.engineNo') = '"+batchOrderQueryVo.getEngineNo()+"'");
+        }
+
+        Page batchOrderList = baseMapper.selectPage(page, queryWrapper);
+        return batchOrderList;
+    }
+
+    /**
+     * 批单审核
+     * @param batchOrderAuditVo
+     * @return
+     */
+    @Override
+    @Transactional
+    public boolean auditBatchOrder(BatchOrderAuditVo batchOrderAuditVo) {
+        BatchOrder batchOrder = baseMapper.selectOne(new LambdaQueryWrapper<BatchOrder>().eq(BatchOrder::getSubOrderNo,batchOrderAuditVo.getOrderNo()));
+        if (Objects.isNull(batchOrder)) {
+            return false;
+        }
+        InsAreaCompany byInsOrderNo = insAreaCompanyService.getById(batchOrderAuditVo.getOrderNo());
+        InsOrders insOrders = insOrdersService.getById(byInsOrderNo.getOrderno());
+        JSONObject carInfo = batchOrder.getCarInfo();
+        JSONObject ownerInfo = batchOrder.getOwnerInfo();
+        JSONObject applyInfo = batchOrder.getApplyInfo();
+        JSONObject insureInfo = batchOrder.getInsureInfo();
+        insOrders.setCarinfo(carInfo);
+        insOrders.setOwnerinfo(ownerInfo);
+        insOrders.setApplyinfo(applyInfo);
+        insOrders.setInsureinfo(insureInfo);
+
+        insOrders.setLicenseno(batchOrder.getCarInfo().getString("licenseno"));
+        insOrders.setFrameno(batchOrder.getCarInfo().getString("frameno"));
+        insOrders.setInsuredname(batchOrder.getInsureInfo().getString("name"));
+
+        batchOrder.setIsAudit(batchOrderAuditVo.getIsAudit());
+        batchOrder.setRejectReason(batchOrderAuditVo.getRejectReason());
+        batchOrder.setAuditTime(LocalDateTime.now());
+
+        batchOrder.setAuditUser(BaseController.getUser().getId());
+        this.updateById(batchOrder);
+        insOrdersService.updateById(insOrders);
+        return true;
+    }
+
+
+
+
+}

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

@@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ydtech.constants.enums.dict.FeeAuditAuditstatus;
+import com.ydtech.constants.enums.dict.InsOrderStatusEnum;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.exception.SystemException;
 import com.ydtech.modules.base.controller.BaseController;
@@ -95,21 +97,19 @@ public class InsAreaCompanyServiceImpl extends ServiceImpl<InsAreaCompanyMapper,
         //生成结算
         //判断协议是否为人工还是自动审核
         PtlAgreement ptlAgreement = ptlAgreementService.getById(insAreaCompany.getAgreementId());
-        if(ptlAgreement.getAuditType() == 2 && insAreaCompany.getOrderstatus().equals("3"))
+        if(ptlAgreement.getAuditType() == 2 && insAreaCompany.getOrderstatus().equals(InsOrderStatusEnum.ACCEPT_INSURANCE.getCode()))
         {
             //如果为自动审核 则自动进行审核
-            insFeeAuditService.feeAudit( insAreaCompany.getOrderno(),insAreaCompany.getId(), true);
+            insFeeAuditService.saveInsFeeAuditAndHistory( insAreaCompany.getOrderno(),insAreaCompany.getId(), true,FeeAuditAuditstatus.PASSED.getCode());
+        }else if(ptlAgreement.getAuditType() == 1 && insAreaCompany.getOrderstatus().equals(InsOrderStatusEnum.ACCEPT_INSURANCE.getCode()))
+        {
+            //添加默认审核 添加审核表及轨迹信息
+            insFeeAuditService.saveDefaultInsFeeAuditAndHistory(insAreaCompany.getOrderno(), insAreaCompany.getId(), FeeAuditAuditstatus.UNREVICEWED.getCode());
         }
+
         //添加订单消息
-        if(insAreaCompany.getOrderstatus().equals("1")){
-            messageSecretaryService.addMessage(MessageTypeConstants.M_3, BaseController.getUser().getId(),"订单号"+insAreaCompany.getOrderno()+"待核保");
-        }else if(insAreaCompany.getOrderstatus().equals("2")){
-            messageSecretaryService.addMessage(MessageTypeConstants.M_3,BaseController.getUser().getId(),"订单号"+insAreaCompany.getOrderno()+"已核保待缴费");
-        }else if(insAreaCompany.getOrderstatus().equals("3")){
-            messageSecretaryService.addMessage(MessageTypeConstants.M_3,BaseController.getUser().getId(),"订单号"+insAreaCompany.getOrderno()+"已经承保成功");
-        }else if(insAreaCompany.getOrderstatus().equals("4")) {
-            messageSecretaryService.addMessage(MessageTypeConstants.M_3, BaseController.getUser().getId(), "订单号" + insAreaCompany.getOrderno() + "核保退回");
-        }
+        messageSecretaryService.addMessage(MessageTypeConstants.M_3, BaseController.getUser().getId(),
+                "订单号"+insAreaCompany.getOrderno()+InsOrderStatusEnum.matchKey(insAreaCompany.getOrderstatus()).getDesc());
         insOrdersTrackService.addingTrajectories(insAreaCompany);
         insOrdersService.updateByOrderStatus(insAreaCompany);
     }

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

@@ -228,12 +228,6 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         insOrdersLambdaQueryWrapper.eq(InsOrders::getOrderno, insAreaCompany.getOrderno());
         update(insOrders, insOrdersLambdaQueryWrapper);
 
-        //已承保添加轨迹表
-        if (InsOrderStatusEnum.ACCEPT_INSURANCE.getCode().equals(insAreaCompany.getOrderstatus())) {
-            //添加审核表及轨迹信息
-            insFeeAuditService.saveInsFeeAuditAndHistory(insAreaCompany.getOrderno(), insAreaCompany.getId(), false, FeeAuditAuditstatus.UNREVICEWED.getCode());
-        }
-
     }
 
 
@@ -553,10 +547,14 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             }
         }
         orderAndAreaCompany.setMobile(sysUser.getMobile());
-        orderAndAreaCompany.setProvince(sysAreas.get(2).getAreaCname());
-        orderAndAreaCompany.setCity(sysAreas.get(1).getAreaCname());
-        orderAndAreaCompany.setPrefecture(sysAreas.get(0).getAreaCname());
-        orderAndAreaCompany.setDeptAreaInfo(null);
+        //归属信息判断是否为空  用户id是否为管理员
+        if(!sysAreas.isEmpty() && !orderAndAreaCompany.getUserid().equals("admin")){
+            orderAndAreaCompany.setProvince(sysAreas.get(2).getAreaCname());
+            orderAndAreaCompany.setCity(sysAreas.get(1).getAreaCname());
+            orderAndAreaCompany.setPrefecture(sysAreas.get(0).getAreaCname());
+            orderAndAreaCompany.setDeptAreaInfo(null);
+        }
+
         //推荐人信息查询
         EsmUserReferrer esmUserReferrer = esmUserReferrerService.getById(orderAndAreaCompany.getUserid());
         if(esmUserReferrer != null){

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

@@ -173,41 +173,25 @@
         pa.agreement_code as agreementCode,
         pa.agreement_name as agreementName
         FROM
-        ins_orders io
-        LEFT JOIN ins_area_company iac ON iac.orderno = io.orderno and iac.orderstatus = 3
-        LEFT JOIN ins_fee_audit ifa ON ifa.ins_order_no = iac.id
+        ins_fee_audit ifa
+        LEFT JOIN ins_orders io ON io.orderno = ifa.orderno
+        LEFT JOIN ins_area_company iac ON iac.orderno = io.orderno
+        AND iac.orderstatus = 3
         LEFT JOIN sys_user su ON su.id = io.userid
         LEFT JOIN sys_dept sd ON sd.id = su.dept_id
         LEFT JOIN sys_user su2 ON ifa.audituser = su2.id
         LEFT JOIN ptl_agreement pa ON pa.id = iac.agreement_id
-        LEFT JOIN esm_ins_company eic on eic.id = pa.partner_companies_id
+        LEFT JOIN esm_ins_company eic ON eic.id = pa.partner_companies_id
         WHERE
-        io.orderno IN (
-        SELECT
-        orderno
-        FROM
-        ins_area_company iac,(
-        SELECT
-        ins_order_no
-        FROM
-        ins_fee_order_new AS o
-        WHERE
-        <if test="params.auditStatus != null and params.auditStatus == 0">
-            NOT EXISTS
-        </if>
-        <if test="params.auditStatus != null and params.auditStatus == 1">
-            ins_order_no in
+        iac.id = ifa.ins_order_no
+        AND iac.orderstatus = 3
+        <if test="params.auditStatus != null and params.auditStatus != ''">
+            and ifa.auditstatus = #{params.auditStatus}
         </if>
-        ( SELECT ins_order_no FROM ins_fee_audit AS a WHERE a.ins_order_no = o.ins_order_no )
-        ) a
-        WHERE
-        iac.id = a.ins_order_no
-        AND orderstatus = 3
         <if test="params.quoteStartDateStr != null and params.quoteStartDateStr != '' and params.quoteEndDateStr != null and params.quoteEndDateStr != ''">
             and DATE_FORMAT(iac.createtime, '%Y-%m-%d') between #{params.quoteStartDateStr} AND
             #{params.quoteEndDateStr}
         </if>
-        )
         <if test="params.taskNo != null and params.taskNo != ''">
             AND io.orderno = #{params.taskNo}
         </if>