fix: lombok 版本升級解決打包問題 style: recommand -> recommend

document/pdm/mall.pdb

@@ -7987,8 +7987,8 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Column>
 <o:Column Id="o328">
 <a:ObjectID>C32DF9EC-A332-4DB2-A56B-74E0F6168FF1</a:ObjectID>
-<a:Name>recommand_status</a:Name>
-<a:Code>recommand_status</a:Code>
+<a:Name>recommend_status</a:Name>
+<a:Code>recommend_status</a:Code>
 <a:CreationDate>1521708193</a:CreationDate>
 <a:Creator>zhenghong</a:Creator>
 <a:ModificationDate>1521708410</a:ModificationDate>

document/pdm/mall.pdm

@@ -7987,8 +7987,8 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Column>
 <o:Column Id="o328">
 <a:ObjectID>C32DF9EC-A332-4DB2-A56B-74E0F6168FF1</a:ObjectID>
-<a:Name>recommand_status</a:Name>
-<a:Code>recommand_status</a:Code>
+<a:Name>recommend_status</a:Name>
+<a:Code>recommend_status</a:Code>
 <a:CreationDate>1521708193</a:CreationDate>
 <a:Creator>zhenghong</a:Creator>
 <a:ModificationDate>1521708410</a:ModificationDate>

document/sql/mall.sql

@@ -846,7 +846,7 @@ CREATE TABLE `pms_product` (
   `delete_status` int(1) DEFAULT NULL COMMENT '删除状态：0->未删除；1->已删除',
   `publish_status` int(1) DEFAULT NULL COMMENT '上架状态：0->下架；1->上架',
   `new_status` int(1) DEFAULT NULL COMMENT '新品状态:0->不是新品；1->新品',
-  `recommand_status` int(1) DEFAULT NULL COMMENT '推荐状态；0->不推荐；1->推荐',
+  `recommend_status` int(1) DEFAULT NULL COMMENT '推荐状态；0->不推荐；1->推荐',
   `verify_status` int(1) DEFAULT NULL COMMENT '审核状态：0->未审核；1->审核通过',
   `sort` int(11) DEFAULT NULL COMMENT '排序',
   `sale` int(11) DEFAULT NULL COMMENT '销量',

mall-admin/src/main/java/com/macro/mall/service/impl/PmsProductServiceImpl.java

@@ -264,7 +264,7 @@ public int updatePublishStatus(List<Long> ids, Integer publishStatus) {
     @Override
     public int updateRecommendStatus(List<Long> ids, Integer recommendStatus) {
         PmsProduct record = new PmsProduct();
-        record.setRecommandStatus(recommendStatus);
+        record.setRecommendStatus(recommendStatus);
         PmsProductExample example = new PmsProductExample();
         example.createCriteria().andIdIn(ids);
         return productMapper.updateByExampleSelective(record, example);

mall-mbg/src/main/java/com/macro/mall/model/PmsProduct.java

@@ -33,7 +33,7 @@ public class PmsProduct implements Serializable {
     private Integer newStatus;
 
     @ApiModelProperty(value = "推荐状态；0->不推荐；1->推荐")
-    private Integer recommandStatus;
+    private Integer recommendStatus;
 
     @ApiModelProperty(value = "审核状态：0->未审核；1->审核通过")
     private Integer verifyStatus;
@@ -210,12 +210,12 @@ public void setNewStatus(Integer newStatus) {
         this.newStatus = newStatus;
     }
 
-    public Integer getRecommandStatus() {
-        return recommandStatus;
+    public Integer getRecommendStatus() {
+        return recommendStatus;
     }
 
-    public void setRecommandStatus(Integer recommandStatus) {
-        this.recommandStatus = recommandStatus;
+    public void setRecommendStatus(Integer recommendStatus) {
+        this.recommendStatus = recommendStatus;
     }
 
     public Integer getVerifyStatus() {
@@ -475,7 +475,7 @@ public String toString() {
         sb.append(", deleteStatus=").append(deleteStatus);
         sb.append(", publishStatus=").append(publishStatus);
         sb.append(", newStatus=").append(newStatus);
-        sb.append(", recommandStatus=").append(recommandStatus);
+        sb.append(", recommendStatus=").append(recommendStatus);
         sb.append(", verifyStatus=").append(verifyStatus);
         sb.append(", sort=").append(sort);
         sb.append(", sale=").append(sale);

mall-mbg/src/main/java/com/macro/mall/model/PmsProductExample.java

@@ -796,63 +796,63 @@ public Criteria andNewStatusNotBetween(Integer value1, Integer value2) {
             return (Criteria) this;
         }
 
-        public Criteria andRecommandStatusIsNull() {
-            addCriterion("recommand_status is null");
+        public Criteria andRecommendStatusIsNull() {
+            addCriterion("recommend_status is null");
             return (Criteria) this;
         }
 
-        public Criteria andRecommandStatusIsNotNull() {
-            addCriterion("recommand_status is not null");
+        public Criteria andRecommendStatusIsNotNull() {
+            addCriterion("recommend_status is not null");
             return (Criteria) this;
         }
 
-        public Criteria andRecommandStatusEqualTo(Integer value) {
-            addCriterion("recommand_status =", value, "recommandStatus");
+        public Criteria andRecommendStatusEqualTo(Integer value) {
+            addCriterion("recommend_status =", value, "recommendStatus");
             return (Criteria) this;
         }
 
-        public Criteria andRecommandStatusNotEqualTo(Integer value) {
-            addCriterion("recommand_status <>", value, "recommandStatus");
+        public Criteria andRecommendStatusNotEqualTo(Integer value) {
+            addCriterion("recommend_status <>", value, "recommendStatus");
             return (Criteria) this;
         }
 
-        public Criteria andRecommandStatusGreaterThan(Integer value) {
-            addCriterion("recommand_status >", value, "recommandStatus");
+        public Criteria andRecommendStatusGreaterThan(Integer value) {
+            addCriterion("recommend_status >", value, "recommendStatus");
             return (Criteria) this;
         }
 
-        public Criteria andRecommandStatusGreaterThanOrEqualTo(Integer value) {
-            addCriterion("recommand_status >=", value, "recommandStatus");
+        public Criteria andRecommendStatusGreaterThanOrEqualTo(Integer value) {
+            addCriterion("recommend_status >=", value, "recommendStatus");
             return (Criteria) this;
         }
 
-        public Criteria andRecommandStatusLessThan(Integer value) {
-            addCriterion("recommand_status <", value, "recommandStatus");
+        public Criteria andRecommendStatusLessThan(Integer value) {
+            addCriterion("recommend_status <", value, "recommendStatus");
             return (Criteria) this;
         }
 
-        public Criteria andRecommandStatusLessThanOrEqualTo(Integer value) {
-            addCriterion("recommand_status <=", value, "recommandStatus");
+        public Criteria andRecommendStatusLessThanOrEqualTo(Integer value) {
+            addCriterion("recommend_status <=", value, "recommendStatus");
             return (Criteria) this;
         }
 
-        public Criteria andRecommandStatusIn(List<Integer> values) {
-            addCriterion("recommand_status in", values, "recommandStatus");
+        public Criteria andRecommendStatusIn(List<Integer> values) {
+            addCriterion("recommend_status in", values, "recommendStatus");
             return (Criteria) this;
         }
 
-        public Criteria andRecommandStatusNotIn(List<Integer> values) {
-            addCriterion("recommand_status not in", values, "recommandStatus");
+        public Criteria andRecommendStatusNotIn(List<Integer> values) {
+            addCriterion("recommend_status not in", values, "recommendStatus");
             return (Criteria) this;
         }
 
-        public Criteria andRecommandStatusBetween(Integer value1, Integer value2) {
-            addCriterion("recommand_status between", value1, value2, "recommandStatus");
+        public Criteria andRecommendStatusBetween(Integer value1, Integer value2) {
+            addCriterion("recommend_status between", value1, value2, "recommendStatus");
             return (Criteria) this;
         }
 
-        public Criteria andRecommandStatusNotBetween(Integer value1, Integer value2) {
-            addCriterion("recommand_status not between", value1, value2, "recommandStatus");
+        public Criteria andRecommendStatusNotBetween(Integer value1, Integer value2) {
+            addCriterion("recommend_status not between", value1, value2, "recommendStatus");
             return (Criteria) this;
         }
 

mall-mbg/src/main/resources/com/macro/mall/mapper/PmsProductMapper.xml

@@ -13,7 +13,7 @@
     <result column="delete_status" jdbcType="INTEGER" property="deleteStatus" />
     <result column="publish_status" jdbcType="INTEGER" property="publishStatus" />
     <result column="new_status" jdbcType="INTEGER" property="newStatus" />
-    <result column="recommand_status" jdbcType="INTEGER" property="recommandStatus" />
+    <result column="recommend_status" jdbcType="INTEGER" property="recommendStatus" />
     <result column="verify_status" jdbcType="INTEGER" property="verifyStatus" />
     <result column="sort" jdbcType="INTEGER" property="sort" />
     <result column="sale" jdbcType="INTEGER" property="sale" />
@@ -107,7 +107,7 @@
   </sql>
   <sql id="Base_Column_List">
     id, brand_id, product_category_id, feight_template_id, product_attribute_category_id, 
-    name, pic, product_sn, delete_status, publish_status, new_status, recommand_status, 
+    name, pic, product_sn, delete_status, publish_status, new_status, recommend_status,
     verify_status, sort, sale, price, promotion_price, gift_growth, gift_point, use_point_limit, 
     sub_title, original_price, stock, low_stock, unit, weight, preview_status, service_ids, 
     keywords, note, album_pics, detail_title, promotion_start_time, promotion_end_time, 
@@ -171,7 +171,7 @@
     insert into pms_product (brand_id, product_category_id, feight_template_id, 
       product_attribute_category_id, name, pic, 
       product_sn, delete_status, publish_status, 
-      new_status, recommand_status, verify_status, 
+      new_status, recommend_status, verify_status,
       sort, sale, price, 
       promotion_price, gift_growth, gift_point, 
       use_point_limit, sub_title, original_price, 
@@ -185,7 +185,7 @@
     values (#{brandId,jdbcType=BIGINT}, #{productCategoryId,jdbcType=BIGINT}, #{feightTemplateId,jdbcType=BIGINT}, 
       #{productAttributeCategoryId,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{pic,jdbcType=VARCHAR}, 
       #{productSn,jdbcType=VARCHAR}, #{deleteStatus,jdbcType=INTEGER}, #{publishStatus,jdbcType=INTEGER}, 
-      #{newStatus,jdbcType=INTEGER}, #{recommandStatus,jdbcType=INTEGER}, #{verifyStatus,jdbcType=INTEGER}, 
+      #{newStatus,jdbcType=INTEGER}, #{recommendStatus,jdbcType=INTEGER}, #{verifyStatus,jdbcType=INTEGER},
       #{sort,jdbcType=INTEGER}, #{sale,jdbcType=INTEGER}, #{price,jdbcType=DECIMAL}, 
       #{promotionPrice,jdbcType=DECIMAL}, #{giftGrowth,jdbcType=INTEGER}, #{giftPoint,jdbcType=INTEGER}, 
       #{usePointLimit,jdbcType=INTEGER}, #{subTitle,jdbcType=VARCHAR}, #{originalPrice,jdbcType=DECIMAL}, 
@@ -233,8 +233,8 @@
       <if test="newStatus != null">
         new_status,
       </if>
-      <if test="recommandStatus != null">
-        recommand_status,
+      <if test="recommendStatus != null">
+        recommend_status,
       </if>
       <if test="verifyStatus != null">
         verify_status,
@@ -358,8 +358,8 @@
       <if test="newStatus != null">
         #{newStatus,jdbcType=INTEGER},
       </if>
-      <if test="recommandStatus != null">
-        #{recommandStatus,jdbcType=INTEGER},
+      <if test="recommendStatus != null">
+        #{recommendStatus,jdbcType=INTEGER},
       </if>
       <if test="verifyStatus != null">
         #{verifyStatus,jdbcType=INTEGER},
@@ -495,8 +495,8 @@
       <if test="record.newStatus != null">
         new_status = #{record.newStatus,jdbcType=INTEGER},
       </if>
-      <if test="record.recommandStatus != null">
-        recommand_status = #{record.recommandStatus,jdbcType=INTEGER},
+      <if test="record.recommendStatus != null">
+        recommend_status = #{record.recommendStatus,jdbcType=INTEGER},
       </if>
       <if test="record.verifyStatus != null">
         verify_status = #{record.verifyStatus,jdbcType=INTEGER},
@@ -606,7 +606,7 @@
       delete_status = #{record.deleteStatus,jdbcType=INTEGER},
       publish_status = #{record.publishStatus,jdbcType=INTEGER},
       new_status = #{record.newStatus,jdbcType=INTEGER},
-      recommand_status = #{record.recommandStatus,jdbcType=INTEGER},
+      recommend_status = #{record.recommendStatus,jdbcType=INTEGER},
       verify_status = #{record.verifyStatus,jdbcType=INTEGER},
       sort = #{record.sort,jdbcType=INTEGER},
       sale = #{record.sale,jdbcType=INTEGER},
@@ -654,7 +654,7 @@
       delete_status = #{record.deleteStatus,jdbcType=INTEGER},
       publish_status = #{record.publishStatus,jdbcType=INTEGER},
       new_status = #{record.newStatus,jdbcType=INTEGER},
-      recommand_status = #{record.recommandStatus,jdbcType=INTEGER},
+      recommend_status = #{record.recommendStatus,jdbcType=INTEGER},
       verify_status = #{record.verifyStatus,jdbcType=INTEGER},
       sort = #{record.sort,jdbcType=INTEGER},
       sale = #{record.sale,jdbcType=INTEGER},
@@ -718,8 +718,8 @@
       <if test="newStatus != null">
         new_status = #{newStatus,jdbcType=INTEGER},
       </if>
-      <if test="recommandStatus != null">
-        recommand_status = #{recommandStatus,jdbcType=INTEGER},
+      <if test="recommendStatus != null">
+        recommend_status = #{recommendStatus,jdbcType=INTEGER},
       </if>
       <if test="verifyStatus != null">
         verify_status = #{verifyStatus,jdbcType=INTEGER},
@@ -826,7 +826,7 @@
       delete_status = #{deleteStatus,jdbcType=INTEGER},
       publish_status = #{publishStatus,jdbcType=INTEGER},
       new_status = #{newStatus,jdbcType=INTEGER},
-      recommand_status = #{recommandStatus,jdbcType=INTEGER},
+      recommend_status = #{recommendStatus,jdbcType=INTEGER},
       verify_status = #{verifyStatus,jdbcType=INTEGER},
       sort = #{sort,jdbcType=INTEGER},
       sale = #{sale,jdbcType=INTEGER},
@@ -871,7 +871,7 @@
       delete_status = #{deleteStatus,jdbcType=INTEGER},
       publish_status = #{publishStatus,jdbcType=INTEGER},
       new_status = #{newStatus,jdbcType=INTEGER},
-      recommand_status = #{recommandStatus,jdbcType=INTEGER},
+      recommend_status = #{recommendStatus,jdbcType=INTEGER},
       verify_status = #{verifyStatus,jdbcType=INTEGER},
       sort = #{sort,jdbcType=INTEGER},
       sale = #{sale,jdbcType=INTEGER},

mall-search/src/main/java/com/macro/mall/search/domain/EsProduct.java

@@ -40,7 +40,7 @@ public class EsProduct implements Serializable {
     private BigDecimal price;
     private Integer sale;
     private Integer newStatus;
-    private Integer recommandStatus;
+    private Integer recommendStatus;
     private Integer stock;
     private Integer promotionType;
     private Integer sort;

mall-search/src/main/resources/dao/EsProductDao.xml

@@ -25,7 +25,7 @@
             p.price price,
             p.sale sale,
             p.new_status newStatus,
-            p.recommand_status recommandStatus,
+            p.recommend_status recommendStatus,
             p.stock stock,
             p.promotion_type promotionType,
             p.keywords keywords,

pom.xml

@@ -74,6 +74,8 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
+            <version>1.18.20</version>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>