产品修改加入类型

src/main/java/com/uas/platform/b2c/prod/commodity/model/ModifyInfo.java

@@ -10,6 +10,16 @@ import javax.persistence.*;
 @Table(name = "trade$goods_modify_info")
 public class ModifyInfo {
 
+    /**
+     * 基本信息
+     */
+    public static final Short TYPE_BASIC = 1;
+
+    /**
+     * 销售信息
+     */
+    public static final Short TYPE_SALE = 2;
+
     /**
      * 主键
      */
@@ -42,6 +52,12 @@ public class ModifyInfo {
     @Column(name = "info_after")
     private String after;
 
+    /**
+     * 修改信息类型
+     */
+    @Column(name = "info_type")
+    private Short type;
+
     public Long getId() {
         return id;
     }
@@ -81,4 +97,12 @@ public class ModifyInfo {
     public void setAfter(String after) {
         this.after = after;
     }
+
+    public Short getType() {
+        return type;
+    }
+
+    public void setType(Short type) {
+        this.type = type;
+    }
 }

src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/GoodsServiceImpl.java

@@ -1297,6 +1297,7 @@ public class GoodsServiceImpl implements GoodsService {
             info.setModifyField(ModifyConstant.MODIFY_IMG.getPhrase());
             info.setBefore(StringConstant.DEFAULT_IMG);
             info.setAfter(StringConstant.NEW_IMG);
+            info.setType(ModifyInfo.TYPE_BASIC);
             infoList.add(info);
         }
         if (StringUtils.hasText(beforeImg) && !beforeImg.equals(afterImg)) {
@@ -1304,6 +1305,7 @@ public class GoodsServiceImpl implements GoodsService {
             info.setModifyField(ModifyConstant.MODIFY_IMG.getPhrase());
             info.setBefore(StringConstant.OLD_IMG);
             info.setAfter(StringConstant.NEW_IMG);
+            info.setType(ModifyInfo.TYPE_BASIC);
             infoList.add(info);
         }
         String beforePackage = beforeGoods.getPackaging();
@@ -1313,6 +1315,7 @@ public class GoodsServiceImpl implements GoodsService {
             info.setModifyField(ModifyConstant.MODIFY_PACKAGE.getPhrase());
             info.setBefore(beforePackage);
             info.setAfter(afterPackage);
+            info.setType(ModifyInfo.TYPE_BASIC);
             infoList.add(info);
         }
         String beforeProduce = beforeGoods.getProduceDate();
@@ -1322,6 +1325,7 @@ public class GoodsServiceImpl implements GoodsService {
             info.setModifyField(ModifyConstant.MODIFY_PRODUCE_DATE.getPhrase());
             info.setBefore(beforeProduce);
             info.setAfter(afterProduce);
+            info.setType(ModifyInfo.TYPE_BASIC);
             infoList.add(info);
         }
         Boolean beforeBreak = beforeGoods.getBreakUp();
@@ -1331,6 +1335,7 @@ public class GoodsServiceImpl implements GoodsService {
             info.setModifyField(ModifyConstant.MODIFY_BREAK_UP.getPhrase());
             info.setBefore(beforeBreak.toString());
             info.setAfter(afterBreak.toString());
+            info.setType(ModifyInfo.TYPE_SALE);
             infoList.add(info);
         }
         Double beforeReserve = beforeGoods.getReserve();
@@ -1349,6 +1354,7 @@ public class GoodsServiceImpl implements GoodsService {
             info.setModifyField(ModifyConstant.MODIFY_PACKAGE_QTY.getPhrase());
             info.setBefore(beforePackQty.toString());
             info.setAfter(afterPackQty.toString());
+            info.setType(ModifyInfo.TYPE_BASIC);
             infoList.add(info);
         }
         Double beforeBuyQty = beforeGoods.getMinBuyQty();
@@ -1358,6 +1364,7 @@ public class GoodsServiceImpl implements GoodsService {
             info.setModifyField(ModifyConstant.MODIFY_BUY_QTY.getPhrase());
             info.setBefore(beforeBuyQty.toString());
             info.setAfter(afterBuyQty.toString());
+            info.setType(ModifyInfo.TYPE_SALE);
             infoList.add(info);
         }
         Short beforeMinDelivery = beforeGoods.getMinDelivery();
@@ -1367,6 +1374,7 @@ public class GoodsServiceImpl implements GoodsService {
             info.setModifyField(ModifyConstant.MODIFY_MIN_DELIVERY.getPhrase());
             info.setBefore(beforeMinDelivery.toString());
             info.setAfter(afterMinDelivery.toString());
+            info.setType(ModifyInfo.TYPE_SALE);
             infoList.add(info);
         }
         Short beforeMaxDelivery = beforeGoods.getMaxDelivery();
@@ -1376,6 +1384,7 @@ public class GoodsServiceImpl implements GoodsService {
             info.setModifyField(ModifyConstant.MODIFY_MAX_DELIVERY.getPhrase());
             info.setBefore(beforeMaxDelivery.toString());
             info.setAfter(afterMaxDelivery.toString());
+            info.setType(ModifyInfo.TYPE_SALE);
             infoList.add(info);
         }
         String beforeStore = beforeGoods.getStoreid();
@@ -1390,6 +1399,7 @@ public class GoodsServiceImpl implements GoodsService {
                 info.setBefore(StringConstant.SALE_SELF);
                 info.setAfter(StringConstant.CONSIGNMENT);
             }
+            info.setType(ModifyInfo.TYPE_SALE);
             infoList.add(info);
         }
         if (!CollectionUtils.isEmpty(infoList)) {