Просмотр исходного кода

对代码进行增强提高代码的健壮性

lipf 4 месяцев назад
Родитель
Сommit
e563f610b0

+ 3 - 3
commons/src/main/java/com/jzg/commons/entity/orders/po/InsFeeAudit.java

@@ -1,11 +1,9 @@
 
 package com.jzg.commons.entity.orders.po;
 
-import java.io.Serializable;
+import java.io.Serial;
 import java.time.LocalDateTime;
-import java.util.Date;
 
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jzg.commons.core.base.BaseModel;
@@ -20,6 +18,8 @@ import lombok.Data;
 @Schema(description = "订单审核表")
 public class InsFeeAudit extends BaseModel {
 
+    @Serial
+    private static final long serialVersionUID = 7798063508653356456L;
     @TableId(value = "order_no")
     @Schema(description = "订单号")
     private String orderNo;

+ 5 - 0
commons/src/main/java/com/jzg/commons/entity/po/InsFeeOrders.java

@@ -9,6 +9,7 @@ import lombok.Data;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.Objects;
 
 /**
  * @author quchen
@@ -60,6 +61,10 @@ public class InsFeeOrders {
     @Schema(description = "总应收保费")
     private BigDecimal totalReceivablePremium;
 
+    public BigDecimal getTotalReceivablePremium(){
+        return Objects.requireNonNullElse(this.totalReceivablePremium, BigDecimal.ZERO);
+    }
+
     @Schema(description = "交强险应付保费")
     private BigDecimal jqPayablePremium;
 

+ 20 - 0
commons/src/main/java/com/jzg/commons/entity/po/SysUserAccount.java

@@ -1,6 +1,8 @@
 package com.jzg.commons.entity.po;
 
+import java.io.Serial;
 import java.math.BigDecimal;
+import java.util.Objects;
 
 import com.jzg.commons.core.base.BaseModel;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -18,6 +20,8 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 public class SysUserAccount extends BaseModel {
 
+    @Serial
+    private static final long serialVersionUID = -6570094253249282304L;
     @Schema(description = "主键")
     private String id;
 
@@ -35,4 +39,20 @@ public class SysUserAccount extends BaseModel {
 
     @Schema(description = "积分")
     private BigDecimal integral;
+
+    public BigDecimal getSumAmount() {
+        return Objects.requireNonNullElse(this.sumAmount, BigDecimal.ZERO);
+    }
+
+    public BigDecimal getSumAmountPaid() {
+        return Objects.requireNonNullElse(this.sumAmountPaid, BigDecimal.ZERO);
+    }
+
+    public BigDecimal getSumAmountUnpaid() {
+        return Objects.requireNonNullElse(this.sumAmountUnpaid, BigDecimal.ZERO);
+    }
+
+    public BigDecimal getIntegral() {
+        return Objects.requireNonNullElse(this.integral, BigDecimal.ZERO);
+    }
 }

+ 2 - 1
tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/controller/InsFeeAuditController.java

@@ -113,7 +113,8 @@ public class InsFeeAuditController {
 
     /**
      * 审核订单
-     * @return
+     *
+     * @return HttpResult<String>
      */
     @PostMapping("/verifyOrder")
     @Operation(summary = "审核订单")

+ 7 - 0
tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsFeeAuditServiceImpl.java

@@ -366,6 +366,10 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
             throw new ServiceException("疑问订单无法直接审核通过,请先取消疑问");
         }
         InsOrders orders = insOrdersService.getById(audit.getOrderNo());
+        if(orders == null){
+            log.info("订单[{}]对应的审核费用数据不存在",audit.getOrderNo());
+            throw new SystemException("订单对应的审核费用数据不存在");
+        }
         if(audit.getAuditStatus() > 0){
             AssertionUtils.isFail(true, "订单已审核刷新订单详情页!");
         }
@@ -551,6 +555,9 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
         }
         audit.setRefuse(param.getRefuse());
         audit.setIsProblem(0);
+        // modify by lipf, 2026年5月20日10:33:03 解决缺少审核时间和审核用户的问题
+        audit.setAuditUser(userName);
+        audit.setAuditTime(LocalDateTime.now());
         this.updateById(audit);
 
         //合伙人佣金比例