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

src/main/java/com/ydtech/modules/fnc/controller/CarSettleController.java

@@ -91,9 +91,12 @@ public class CarSettleController extends BaseController {
     public HttpResult auditFee(@RequestBody @Valid AuditOrderFeeVo auditOrderFeeVo) {
 //        订单号
         String orderNo = auditOrderFeeVo.getOrderNo();
+        String insOrderNo = auditOrderFeeVo.getInsOrderNo();
+
         //查询改订单是已审核
         List<InsFeeAudit> feeList = insFeeAuditService.lambdaQuery()
                 .eq(InsFeeAudit::getOrderno, orderNo)
+                .eq(InsFeeAudit::getInsOrderNo, insOrderNo)
                 .eq(InsFeeAudit::getAuditstatus, FeeAuditAuditstatus.PASSED.getCode())
                 .list();
 
@@ -104,6 +107,7 @@ public class CarSettleController extends BaseController {
         //查询已承保的子订单号
         List<InsAreaCompany> areaList = insAreaCompanyService.lambdaQuery()
                 .eq(StringUtils.isNotEmpty(orderNo), InsAreaCompany::getOrderno, orderNo)
+                .eq(StringUtils.isNotEmpty(insOrderNo),InsAreaCompany::getId,insOrderNo)
                 .eq(InsAreaCompany::getOrderstatus, InsOrderStatusEnum.ACCEPT_INSURANCE.getCode())
                 .list();//3已承保
 

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

@@ -816,7 +816,9 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
     @Override
     public InsFeeAudit saveDefaultInsFeeAuditAndHistory(String orderNo, String insOrderNo, String auditstatus, String rejectInfo) {
         //查询费用审核表
-        InsFeeAudit insFeeAudit = getOne(new LambdaQueryWrapper<InsFeeAudit>().eq(InsFeeAudit::getOrderno, orderNo));
+        InsFeeAudit insFeeAudit = getOne(new LambdaQueryWrapper<InsFeeAudit>()
+                .eq(InsFeeAudit::getOrderno, orderNo)
+                .eq(InsFeeAudit::getInsOrderNo, insOrderNo));
 
         //添加审核轨迹表
         InsFeeAuditHistory insFeeAuditHistory = new InsFeeAuditHistory();
@@ -829,16 +831,18 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
             this.save(insFeeAudit);
         } else {
             //状态码为已审核且数据不为空,则更新审核状态
-            //如果传入的为审核驳回 则将审核状态至为0
-            if(auditstatus.equals("2")) {
-                insFeeAudit.setAuditstatus("0");
-            }else{
+            //如果审核状态为已审核则一直都是已审核
+            if(insFeeAudit.getAuditstatus().equals("1")) {
                 insFeeAudit.setAuditstatus(insFeeAudit.getAuditstatus());
+            }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));
+            this.update(insFeeAudit, new LambdaUpdateWrapper<InsFeeAudit>()
+                    .eq(InsFeeAudit::getOrderno, orderNo)
+                    .eq(InsFeeAudit::getInsOrderNo, insOrderNo));
         }
         //复制审核对象的属性
         BeanUtils.copyProperties(insFeeAudit, insFeeAuditHistory);

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

@@ -15,6 +15,9 @@ public class AuditOrderFeeVo {
     @ApiModelProperty(value = "订单号")
     private String orderNo;
 
+    @ApiModelProperty(value = "子订单号")
+    private String insOrderNo;
+
     @ApiModelProperty(value = "交强总费用比例")
     private String jqCostsProportionStr;