权益id修改

commons/src/main/java/com/jzg/commons/entity/rights/dto/InsOrderRightsDto.java

@@ -17,13 +17,13 @@ import java.util.Date;
 @Schema(description = "订单选择权益券DTO")
 @Data
 public class InsOrderRightsDto {
-    @Schema(description = "id")
-    private String id;
+    @Schema(description = "权益券id:对应生活服务平台返回的id")
+    private String rightsId;
 
     @Schema(description = "订单ID")
     private String orderId;
-    @Schema(description = "权益券ID")
-    private String rightsInfoId;
+//    @Schema(description = "权益券ID")
+//    private String rightsInfoId;
     /**类型（1.兑换券 2.折扣卷 3.抵现劵）*/
     @Schema(description= "类型（1.兑换券 2.折扣卷 3.抵现劵）")
     private String type;

commons/src/main/java/com/jzg/commons/entity/rights/dto/InsOrderRightsPackageDto.java

@@ -20,13 +20,13 @@ import java.util.List;
 @Schema(description = "订单选择权益套餐DTO")
 @Data
 public class InsOrderRightsPackageDto {
-    @Schema(description = "主键")
-    private String id;
+    @Schema(description = "权益套餐id:对应生活服务平台返回的id")
+    private String rightsId;
 
     @Schema(description = "订单ID")
     private String orderId;
-    @Schema(description = "权益套餐id")
-    private String rightsPackageId;
+//    @Schema(description = "权益套餐id")
+//    private String rightsPackageId;
     @Schema(description = "权益套餐名称")
     private String equityPackageName;
 

commons/src/main/java/com/jzg/commons/entity/rights/po/InsOrderRights.java

@@ -29,7 +29,7 @@ public class InsOrderRights {
     @Schema(description = "订单ID")
     private String orderId;
     @Schema(description = "权益券ID")
-    private String rightsInfoId;
+    private String rightsId;
     /**类型（1.兑换券 2.折扣卷 3.抵现劵）*/
     @Schema(description= "类型（1.兑换券 2.折扣卷 3.抵现劵）")
     private String type;

commons/src/main/java/com/jzg/commons/entity/rights/po/InsOrderRightsPackage.java

@@ -30,8 +30,8 @@ public class InsOrderRightsPackage {
 
     @Schema(description = "订单ID")
     private String orderId;
-    @Schema(description = "权益套餐id")
-    private String rightsPackageId;
+    @Schema(description = "权益套餐ID")
+    private String rightsId;
     @Schema(description = "权益套餐名称")
     private String equityPackageName;
 

commons/src/main/java/com/jzg/commons/entity/rights/vo/InsOrderRightsPackageVo.java

@@ -26,7 +26,7 @@ public class InsOrderRightsPackageVo {
     @Schema(description = "订单ID")
     private String orderId;
     @Schema(description = "权益套餐id")
-    private String rightsPackageId;
+    private String rightsId;
     @Schema(description = "权益套餐名称")
     private String equityPackageName;
 
@@ -123,7 +123,7 @@ public class InsOrderRightsPackageVo {
         if (rightsPackage != null) {
             this.id = rightsPackage.getId();
             this.orderId = rightsPackage.getOrderId();
-            this.rightsPackageId = rightsPackage.getRightsPackageId();
+            this.rightsId = rightsPackage.getRightsId();
             this.equityPackageName = rightsPackage.getEquityPackageName();
             this.costPriceMax = rightsPackage.getCostPriceMax();
             this.costPriceMin = rightsPackage.getCostPriceMin();

commons/src/main/java/com/jzg/commons/entity/rights/vo/InsOrderRightsVo.java

@@ -26,7 +26,7 @@ public class InsOrderRightsVo {
     @Schema(description = "订单ID")
     private String orderId;
     @Schema(description = "权益券ID")
-    private String rightsInfoId;
+    private String rightsId;
     /**类型（1.兑换券 2.折扣卷 3.抵现劵）*/
     @Schema(description= "类型（1.兑换券 2.折扣卷 3.抵现劵）")
     private String type;
@@ -124,7 +124,7 @@ public class InsOrderRightsVo {
         // 复制基本属性
         this.id = rights.getId();
         this.orderId = rights.getOrderId();
-        this.rightsInfoId = rights.getRightsInfoId();
+        this.rightsId = rights.getRightsId();
         this.type = rights.getType();
         this.rightsName = rights.getRightsName();
         this.classify = rights.getClassify();

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

@@ -371,7 +371,7 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
 
                                 // 构建权益单品请求参数
                                 ChannelRightsGrantRightsDTO rightsItem = new ChannelRightsGrantRightsDTO();
-                                rightsItem.setRightsContentId( rights.getRightsInfoId());
+                                rightsItem.setRightsContentId( rights.getRightsId());
                                 rightsItem.setRightsCount( rights.getRightsCount());
                                 rightsItem.setRightsType( 1);
                                 rightsRequest.add(rightsItem);
@@ -396,7 +396,7 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
 
                                 // 构建权益套餐请求参数
                                 ChannelRightsGrantRightsDTO rightsItem = new ChannelRightsGrantRightsDTO();
-                                rightsItem.setRightsContentId( pkg.getRightsPackageId());
+                                rightsItem.setRightsContentId( pkg.getRightsId());
                                 rightsItem.setRightsCount( pkg.getRightsCount());
                                 rightsItem.setRightsType( 2);
                                 rightsRequest.add(rightsItem);

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/utils/FeignConfig.java

@@ -58,6 +58,12 @@ public class FeignConfig {
                         // 方式1：如果是Map类型，直接添加字段
                         if (obj instanceof Map) {
                             Map<String, Object> map = (Map<String, Object>) obj;
+                            // 1. 将 id 字段替换为 rightsId
+                            if (map.containsKey("id")) {
+                                Object idValue = map.get("id");
+                                map.put("rightsId", idValue);
+                                map.remove("id");
+                            }
                             map.put("rightsCount", 0);  // 添加给新字段选择的权益数量，默认值0
                             records.add(map);
                         }
@@ -65,6 +71,12 @@ public class FeignConfig {
                         else {
                             // 将原对象转换为JsonNode，添加新字段后再转回Object
                             ObjectNode objectNode = mapper.valueToTree(obj);
+                            // 1. 将 id 字段替换为 rightsId
+                            if (objectNode.has("id")) {
+                                JsonNode idValue = objectNode.get("id");
+                                objectNode.set("rightsId", idValue);
+                                objectNode.remove("id");
+                            }
                             objectNode.put("rightsCount", 0);  // 添加新字段选择的权益数量，默认值0
                             Object newObj = mapper.treeToValue(objectNode, obj.getClass());
                             records.add(newObj);

tenant/insurance/quotation-summary/src/main/resources/mapper/InsOrderRightsMapper.xml

@@ -7,7 +7,7 @@
     <resultMap id="BaseResultMap" type="com.jzg.commons.entity.rights.po.InsOrderRights">
         <id property="id" column="id" jdbcType="BIGINT"/>
         <result property="orderId" column="order_id" jdbcType="VARCHAR"/>
-        <result property="rightsInfoId" column="rights_info_id" jdbcType="VARCHAR"/>
+        <result property="rightsId" column="rights_id" jdbcType="VARCHAR"/>
         <result property="type" column="type" jdbcType="VARCHAR"/>
         <result property="rightsName" column="rights_name" jdbcType="VARCHAR"/>
         <result property="classify" column="classify" jdbcType="VARCHAR"/>
@@ -31,7 +31,7 @@
     </resultMap>
 
     <sql id="Base_Column_List">
-            id,order_id,rights_info_id,
+            id,order_id,rights_id,
             rights_name,
             amount,rights_type,rights_count,receiver_type,receiver_name,receiver_mobile
     </sql>

tenant/insurance/quotation-summary/src/main/resources/mapper/InsOrderRightsPackageMapper.xml

@@ -7,7 +7,7 @@
     <resultMap id="BaseResultMap" type="com.jzg.commons.entity.rights.po.InsOrderRightsPackage">
         <id property="id" column="id" jdbcType="BIGINT"/>
         <result property="orderId" column="order_id" jdbcType="VARCHAR"/>
-        <result property="rightsPackageId" column="rights_package_id" jdbcType="VARCHAR"/>
+        <result property="rightsId" column="rights_id" jdbcType="VARCHAR"/>
         <result property="equityPackageName" column="equity_package_name" jdbcType="VARCHAR"/>
         <result property="costPriceMin" column="cost_price_max" jdbcType="VARCHAR"/>
         <result property="costPriceMin" column="cost_price_min" jdbcType="VARCHAR"/>
@@ -27,7 +27,7 @@
     </resultMap>
 
     <sql id="Base_Column_List">
-            id,order_id,rights_package_id,
+            id,order_id,rights_id,
             equity_package_name,
             package_price,rights_type,rights_count,receiver_type,receiver_name,receiver_mobile
     </sql>