Forráskód Böngészése

核保前校验权益已使用金额不超过可用金额;无用代码去除

郭子栋 5 hónapja
szülő
commit
868146177b

+ 0 - 11
commons/src/main/java/com/jzg/commons/entity/rights/dto/InsOrderRightsInfoDto.java

@@ -3,7 +3,6 @@ package com.jzg.commons.entity.rights.dto;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -23,14 +22,4 @@ public class InsOrderRightsInfoDto {
 
     @Schema(description = "权益接收人")
     private RightsGrantReceiverDTO rightsGrantReceiverDTO;
-
-    @Schema(description = "权益相关:可用金额<可用金额=出口费用➖出口人留点费用>")
-    private BigDecimal availableAmount;
-
-    @Schema(description = "权益相关:已使用金额<发放权益价格总数量(结算价)>")
-    private BigDecimal 	usedAmount;
-
-    @Schema(description = "权益相关:剩余金额<可用金额-已使用金额>")
-    private BigDecimal remainingAmount;
-
 }

+ 3 - 3
tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/controller/InsFeeOrderController.java

@@ -4,13 +4,13 @@ import com.alibaba.fastjson.JSONObject;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.dto.InsFeeOrdersParam;
 import com.jzg.commons.entity.po.InsFeeOrders;
+import com.jzg.quotation.summary.entity.dto.RightsAmountUpdateDto;
 import com.jzg.quotation.summary.service.InsFeeOrdersService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -62,8 +62,8 @@ public class InsFeeOrderController {
 
     @Operation(summary = "修改权益可用金额")
     @PostMapping("updateAvailableAmount")
-    public HttpResult updateOrders(@RequestParam("orderNo") String orderNo,@RequestParam("availableAmount") BigDecimal availableAmount) {
-        return insFeeOrdersService.updateAvailableAmount(orderNo,availableAmount);
+    public HttpResult updateOrders(@RequestBody RightsAmountUpdateDto rightsAmountUpdateDto) {
+        return insFeeOrdersService.updateAvailableAmount(rightsAmountUpdateDto.getOrderNo(),rightsAmountUpdateDto.getAvailableAmount());
     }
 
 }

+ 24 - 0
tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/entity/dto/RightsAmountUpdateDto.java

@@ -0,0 +1,24 @@
+package com.jzg.quotation.summary.entity.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.math.BigDecimal;
+
+/**
+ * 类描述:权益修改可用金额dto
+ *
+ * @author Administrator
+ * @version 1.0
+ * @date 2026/3/23 16:46
+ */
+@Data
+public class RightsAmountUpdateDto {
+    @NotBlank(message = "订单号不能为空")
+    @Schema(description = "orderNo")
+    private String orderNo;
+    @NotBlank(message = "可用金额不能为空")
+    @Schema(description = "availableAmount")
+    private BigDecimal availableAmount;
+}

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

@@ -25,6 +25,7 @@ import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 
 /**
@@ -106,6 +107,7 @@ public class InsOrderRightsInfoServiceImpl implements InsOrderRightsInfoService
             log.info("订单权益券信息保存成功!");
             if(hasRights || hasPackages){
                 InsFeeOrders feeOrders = insFeeOrdersService.getById(orderNo);
+                AssertionUtils.isFail(Objects.isNull(feeOrders),"费用信息不匹配");
                 setUsedAmountAndRemainAmount(feeOrders,insOrderRightsInfoDto.getInsOrderRightsList(),insOrderRightsInfoDto.getInsOrderRightsPackageList());
                 //更新订单表的权益可用金额、已使用金额、剩余金额
                 insFeeOrdersService.updateById(feeOrders);