Pārlūkot izejas kodu

产品删除不需要的属性,以及实现产品的saveOrUpdate

杨六六 4 gadi atpakaļ
vecāks
revīzija
f0ac1b7057

+ 3 - 14
common/fire-dto/src/main/java/com/fire/dto/FireProductInfo.java

@@ -34,21 +34,15 @@ public class FireProductInfo extends Model<FireProductInfo> {
     /**
      * 产品ID号
      */
-    @ApiModelProperty(value = "产品id ,(查询条件之一)")
-    @TableId(value = "product_id", type = IdType.AUTO)
-    private BigInteger productId;
 
     /**
      * 流量包ID
      */
-    @ApiModelProperty(value = "流量包ID")
+    @ApiModelProperty(value = "产品编号")
+    @TableId(value = "package_id")
     private String packageId;
 
-    /**
-     * 产品代码
-     */
-    @ApiModelProperty(value = "产品代码")
-    private String productCode;
+
     /**
      * 产品名称
      */
@@ -66,11 +60,6 @@ public class FireProductInfo extends Model<FireProductInfo> {
     @ApiModelProperty(value = "面额(查询条件之一)")
     private BigDecimal productPrice;
 
-    /**
-     * 产品描述
-     */
-    @ApiModelProperty(value = "产品描述")
-    private String productDesc;
 
     /**
      * 创建者

+ 1 - 13
modules/admin/src/main/java/com/fire/admin/dto/FireProductInfoDto.java

@@ -20,19 +20,12 @@ import java.math.BigInteger;
 public class FireProductInfoDto {
 
 
-    @ApiModelProperty(value = "产品id ,(查询条件之一)")
-    private BigInteger productId;
     /**
      * 流量包ID
      */
-    @ApiModelProperty(value = "流量包ID")
+    @ApiModelProperty(value = "产品编号")
     private String packageId;
 
-    /**
-     * 产品代码
-     */
-    @ApiModelProperty(value = "产品代码")
-    private String productCode;
     /**
      * 产品名称
      */
@@ -50,11 +43,6 @@ public class FireProductInfoDto {
     @ApiModelProperty(value = "面额(查询条件之一)")
     private BigDecimal productPrice;
 
-    /**
-     * 产品描述
-     */
-    @ApiModelProperty(value = "产品描述")
-    private String productDesc;
 
     /**
      * 创建者

+ 2 - 9
modules/admin/src/main/java/com/fire/admin/service/impl/FireProductServiceImpl.java

@@ -54,11 +54,9 @@ public class FireProductServiceImpl extends ServiceImpl<FireProductMapper, FireP
         }
 
         FireProductInfo productInfo = FireProductInfo.builder().packageId(packageId)
-                .productCode(fireProductInfoDto.getProductCode())
                 .productName(fireProductInfoDto.getProductName())
                 .productType(fireProductInfoDto.getProductType())
                 .productPrice(fireProductInfoDto.getProductPrice())
-                .productDesc(fireProductInfoDto.getProductDesc())
                 .createTime(DateUtils.strformatDatetime(LocalDateTime.now()))
                 .areaNum(EnumUtils.convert(fireProductInfoDto.getAreaName()))
                 .areaName(fireProductInfoDto.getAreaName())
@@ -67,7 +65,6 @@ public class FireProductServiceImpl extends ServiceImpl<FireProductMapper, FireP
         log.info("新增产品,产品适用于客户和通道。产品信息为:【{}】", productInfo.toString());
         boolean flat = this.saveOrUpdate(productInfo);
         if (flat) {
-
             // TODO 发送消息到 产品的 TOPIC
         }
         return flat;
@@ -84,13 +81,11 @@ public class FireProductServiceImpl extends ServiceImpl<FireProductMapper, FireP
     public FireProductInfoVo getProductInfoDetail(Integer productId) {
         FireProductInfo fireProductInfo = this.baseMapper.selectById(productId);
 
-        FireProductInfoVo productInfoVo = FireProductInfoVo.builder().productId(fireProductInfo.getProductId())
+        FireProductInfoVo productInfoVo = FireProductInfoVo.builder()
                 .packageId(fireProductInfo.getPackageId())
-                .productCode(fireProductInfo.getProductCode())
                 .productName(fireProductInfo.getProductName())
                 .productType(fireProductInfo.getProductType())
                 .productPrice(fireProductInfo.getProductPrice())
-                .productDesc(fireProductInfo.getProductDesc())
                 .creator(fireProductInfo.getCreator())
                 .createTime(fireProductInfo.getCreateTime())
                 .updator(fireProductInfo.getUpdator())
@@ -112,13 +107,11 @@ public class FireProductServiceImpl extends ServiceImpl<FireProductMapper, FireP
     @Override
     public int updateProductInfo(FireProductInfoDto fireProductInfoDto) {
 
-        FireProductInfo productInfo = FireProductInfo.builder().productId(fireProductInfoDto.getProductId())
+        FireProductInfo productInfo = FireProductInfo.builder()
                 .packageId(fireProductInfoDto.getPackageId())
-                .productCode(fireProductInfoDto.getProductCode())
                 .productName(fireProductInfoDto.getProductName())
                 .productType(fireProductInfoDto.getProductType())
                 .productPrice(fireProductInfoDto.getProductPrice())
-                .productDesc(fireProductInfoDto.getProductDesc())
                 .updateTime(DateUtils.strformatDatetime(LocalDateTime.now()))
                 .areaNum(EnumUtils.convert(fireProductInfoDto.getAreaName()))
                 .areaName(fireProductInfoDto.getAreaName())

+ 2 - 14
modules/admin/src/main/java/com/fire/admin/vo/FireProductInfoVo.java

@@ -18,20 +18,13 @@ import java.math.BigInteger;
 @Builder
 public class FireProductInfoVo   {
 
-    /**
-     * 产品ID号
-     */
-    private BigInteger productId;
+
 
     /**
-     * 流量包ID
+     * 产品编号
      */
     private String packageId;
 
-    /**
-     * 产品代码
-     */
-    private String productCode;
     /**
      * 产品名称
      */
@@ -46,11 +39,6 @@ public class FireProductInfoVo   {
      */
     private BigDecimal productPrice;
 
-    /**
-     * 产品描述
-     */
-    private String productDesc;
-
     /**
      * 创建者
      */

+ 3 - 7
modules/admin/src/main/resources/mapper/FireProductMapper.xml

@@ -4,8 +4,7 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.fire.dto.FireProductInfo">
-        <id column="product_id" property="productId"/>
-        <result column="package_id" property="packageId"/>
+        <id column="package_id" property="packageId"/>
         <result column="product_code" property="productCode"/>
         <result column="product_name" property="productName"/>
         <result column="product_type" property="productType"/>
@@ -23,7 +22,6 @@
 
 
     <resultMap id="ResultMap" type="com.fire.admin.vo.FireProductInfoVo">
-        <result column="product_id" property="productId"/>
         <result column="package_id" property="packageId"/>
         <result column="product_code" property="productCode"/>
         <result column="product_name" property="productName"/>
@@ -40,10 +38,8 @@
     </resultMap>
 
 
-
     <select id="selectFireProductInfo" resultMap="ResultMap">
         SELECT
-        `product_id`,
         `package_id`,
         `product_code`,
         `product_name`,
@@ -63,8 +59,8 @@
             <if test="query.productName != null and query.productName != ''">
                 and product_name LIKE CONCAT('%',#{query.productName},'%')
             </if>
-            <if test="query.productId != null and query.productId != '' and query.productId!=0 ">
-               and product_id =#{query.productId}
+            <if test="query.packageId != null and query.packageId != '' ">
+                and package_id =#{query.packageId}
             </if>
             <if test="query.productPrice != null and query.productPrice != ''">
                 and product_price =#{query.productPrice}