Parcourir la source

权益修改权益劵赋值

Qchen il y a 3 mois
Parent
commit
bc8457c5f6

+ 2 - 0
commons/src/main/java/com/jzg/commons/entity/rights/dto/InsOrderRightsDto.java

@@ -20,6 +20,8 @@ import java.util.List;
 @Schema(description = "订单选择权益券DTO")
 @Schema(description = "订单选择权益券DTO")
 @Data
 @Data
 public class InsOrderRightsDto {
 public class InsOrderRightsDto {
+    @Schema(description = "权益id")
+    private String id;
 
 
     @Schema(description = "权益类型 1 券  2 套餐")
     @Schema(description = "权益类型 1 券  2 套餐")
     private String rightType;
     private String rightType;

+ 2 - 0
commons/src/main/java/com/jzg/commons/entity/rights/dto/InsOrderRightsPackageDto.java

@@ -20,6 +20,8 @@ import java.util.List;
 @Schema(description = "订单选择权益套餐DTO")
 @Schema(description = "订单选择权益套餐DTO")
 @Data
 @Data
 public class InsOrderRightsPackageDto {
 public class InsOrderRightsPackageDto {
+    @Schema(description = "id")
+    private String id;
     @Schema(description = "权益套餐id:对应生活服务平台返回的id")
     @Schema(description = "权益套餐id:对应生活服务平台返回的id")
     private String rightsId;
     private String rightsId;
 
 

+ 1 - 1
commons/src/main/java/com/jzg/commons/entity/rights/dto/RightsGrantReceiverDTO.java

@@ -13,7 +13,7 @@ import lombok.Data;
 @Schema(description = "权益发放接收人DTO")
 @Schema(description = "权益发放接收人DTO")
 public class RightsGrantReceiverDTO {
 public class RightsGrantReceiverDTO {
 
 
-    @Schema(description = "接收人类型 1 车主 2 投保人 3 被保人")
+    @Schema(description = "接收人类型 1 车主 2 投保人 3 被保人 4 其他")
     private Integer receiverType;
     private Integer receiverType;
 
 
     @Schema(description = "接收人姓名")
     @Schema(description = "接收人姓名")

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

@@ -4,6 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.Data;
 
 
 import java.math.BigDecimal;
 import java.math.BigDecimal;
+import java.util.List;
 
 
 @Data
 @Data
 @Schema(description = "权益券查询参数")
 @Schema(description = "权益券查询参数")
@@ -30,6 +31,8 @@ public class ChannelRightsQueryDTO {
     @Schema(description = "权益券分类")
     @Schema(description = "权益券分类")
     private String classify;
     private String classify;
 
 
+    @Schema(description = "权益券分类集合")
+    private List<String> classifyList;
     @Schema(description = "页码,默认1")
     @Schema(description = "页码,默认1")
     private Integer pageNo = 1;
     private Integer pageNo = 1;
 
 

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

@@ -81,6 +81,7 @@ public class InsOrderRightsInfoServiceImpl implements InsOrderRightsInfoService
                     insOrderRights.setReceiverName(rightsGrantReceiverDTO.getReceiverName());
                     insOrderRights.setReceiverName(rightsGrantReceiverDTO.getReceiverName());
                     insOrderRights.setReceiverType(rightsGrantReceiverDTO.getReceiverType());
                     insOrderRights.setReceiverType(rightsGrantReceiverDTO.getReceiverType());
                     insOrderRights.setOrderId(orderNo);
                     insOrderRights.setOrderId(orderNo);
+                    insOrderRights.setRightsId(insOrderRightsDto.getId());
                     insOrderRightsList.add(insOrderRights);
                     insOrderRightsList.add(insOrderRights);
                 }
                 }
                 insOrderRightsService.saveInsOrderRights(insOrderRightsList);
                 insOrderRightsService.saveInsOrderRights(insOrderRightsList);
@@ -99,6 +100,7 @@ public class InsOrderRightsInfoServiceImpl implements InsOrderRightsInfoService
                     insOrderRightsPackage.setReceiverName(rightsGrantReceiverDTO.getReceiverName());
                     insOrderRightsPackage.setReceiverName(rightsGrantReceiverDTO.getReceiverName());
                     insOrderRightsPackage.setReceiverType(rightsGrantReceiverDTO.getReceiverType());
                     insOrderRightsPackage.setReceiverType(rightsGrantReceiverDTO.getReceiverType());
                     insOrderRightsPackage.setOrderId(orderNo);
                     insOrderRightsPackage.setOrderId(orderNo);
+                    insOrderRightsPackage.setRightsId(insOrderRightsPackageDto.getId());
                     insOrderRightsPackageList.add(insOrderRightsPackage);
                     insOrderRightsPackageList.add(insOrderRightsPackage);
                 }
                 }
                 insOrderRightsPackageService.saveInsOrderRightsPackage(insOrderRightsPackageList);
                 insOrderRightsPackageService.saveInsOrderRightsPackage(insOrderRightsPackageList);