bug 修改，把产品的product_id 字段重新加回来

common/fire-dto/src/main/java/com/fire/dto/FireProductInfo.java

@@ -6,9 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
+import lombok.*;
 import lombok.experimental.Accessors;
 
 import java.math.BigDecimal;
@@ -27,19 +25,23 @@ import java.math.BigInteger;
 @Accessors(chain = true)
 @TableName("flow_product_info")
 @Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class FireProductInfo extends Model<FireProductInfo> {
 
     private static final long serialVersionUID = 1L;
 
     /**
-     * 产品ID号
+     * 产品zhu
      */
+    @ApiModelProperty(value = "产品编号（主键）")
+    @TableId(value = "product_id", type = IdType.AUTO)
+    private Integer productId;
 
     /**
      * 流量包ID
      */
-    @ApiModelProperty(value = "产品编号")
-    @TableId(value = "package_id",type=IdType.INPUT)
+    @ApiModelProperty(value = "产品编码")
     private String packageId;
 
 

modules/admin/src/main/java/com/fire/admin/dto/FireProductInfoDto.java

@@ -20,10 +20,14 @@ import java.math.BigInteger;
 public class FireProductInfoDto {
 
 
+
+    @ApiModelProperty(value = "产品编号（主键）")
+    private Integer productId;
+
     /**
-     * 流量包ID
+     * 产品编码
      */
-    @ApiModelProperty(value = "产品编号")
+    @ApiModelProperty(value = "产品编码")
     private String packageId;
 
     /**

modules/admin/src/main/java/com/fire/admin/service/impl/FireProductServiceImpl.java

@@ -1,7 +1,10 @@
 package com.fire.admin.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fire.admin.dto.FireProductInfoDto;
@@ -18,6 +21,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * @author: liuliu
@@ -56,8 +60,14 @@ public class FireProductServiceImpl extends ServiceImpl<FireProductMapper, FireP
             packageId=packageId.concat("_").concat(EnumUtils.convert(fireProductInfoDto.getAreaName()));
         }
 
-        FireProductInfo fireProductInfo = baseMapper.selectById(packageId);
-        if(ObjectUtil.hasEmpty(fireProductInfo)){
+        LambdaQueryWrapper<FireProductInfo> query = new LambdaQueryWrapper<FireProductInfo>();
+        query.select(FireProductInfo::getPackageId,FireProductInfo::getProductId)
+                .eq(FireProductInfo::getPackageId,packageId).
+                eq(FireProductInfo::getIsDelete,0);
+
+        List<FireProductInfo> productInfos = baseMapper.selectList(query);
+
+        if(ObjectUtil.hasEmpty(productInfos)){
             FireProductInfo productInfo = FireProductInfo.builder().packageId(packageId)
                     .productName(fireProductInfoDto.getProductName())
                     .productType(fireProductInfoDto.getProductType())
@@ -65,10 +75,10 @@ public class FireProductServiceImpl extends ServiceImpl<FireProductMapper, FireP
                     .createTime(DateUtils.strformatDatetime(LocalDateTime.now()))
                     .areaNum(EnumUtils.convert(fireProductInfoDto.getAreaName()))
                     .areaName(fireProductInfoDto.getAreaName())
-                    .creator(SecurityUtil.getUser().getUsername())
+                    //.creator(SecurityUtil.getUser().getUsername())
+                    .creator("T")
                     .operator(fireProductInfoDto.getOperator()).build();
 
-
             log.info("新增产品，产品适用于客户和通道。产品信息为：【{}】", productInfo.toString());
             int count =baseMapper.insert(productInfo);
             if (count>0) {

modules/admin/src/main/java/com/fire/admin/vo/FireProductInfoVo.java

@@ -1,6 +1,7 @@
 package com.fire.admin.vo;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Builder;
 import lombok.Data;
 
@@ -19,6 +20,8 @@ import java.math.BigInteger;
 public class FireProductInfoVo   {
 
 
+    @ApiModelProperty(value = "产品编号（主键）")
+    private Integer productId;
 
     /**
      * 产品编号

modules/admin/src/main/resources/mapper/FireProductMapper.xml

@@ -4,7 +4,8 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.fire.dto.FireProductInfo">
-        <id column="package_id" property="packageId"/>
+        <id column="product_id" property="productId"/>
+        <result column="package_id" property="packageId"/>
         <result column="product_name" property="productName"/>
         <result column="product_type" property="productType"/>
         <result column="product_price" property="productPrice"/>
@@ -20,6 +21,7 @@
 
 
     <resultMap id="ResultMap" type="com.fire.admin.vo.FireProductInfoVo">
+        <result column="product_id" property="productId"/>
         <result column="package_id" property="packageId"/>
         <result column="product_name" property="productName"/>
         <result column="product_type" property="productType"/>
@@ -36,6 +38,7 @@
 
     <select id="selectFireProductInfo" resultMap="ResultMap">
         SELECT
+        `product_id`,
         `package_id`,
         `product_name`,
         `product_type`,