1.库存预警提示语修改

2.库存预警30分钟内只推送一次
3.点歌支付成功同步保存平台订单号

src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopSongOrder.java

@@ -6,13 +6,13 @@ import java.util.Date;
 import lombok.Data;
 
 /**
- *
+ * 
  * @TableName tb_shop_song_order
  */
 @Data
 public class TbShopSongOrder implements Serializable {
     /**
-     *
+     * 
      */
     private Integer id;
 
@@ -27,7 +27,7 @@ public class TbShopSongOrder implements Serializable {
     private String songName;
 
     /**
-     * 用户id
+     * 用户openId
      */
     private String openId;
 
@@ -81,6 +81,11 @@ public class TbShopSongOrder implements Serializable {
      */
     private BigDecimal realMoney;
 
+    /**
+     * 平台订单号
+     */
+    private String payOrderId;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -108,7 +113,8 @@ public class TbShopSongOrder implements Serializable {
             && (this.getToName() == null ? other.getToName() == null : this.getToName().equals(other.getToName()))
             && (this.getNote() == null ? other.getNote() == null : this.getNote().equals(other.getNote()))
             && (this.getShopId() == null ? other.getShopId() == null : this.getShopId().equals(other.getShopId()))
-            && (this.getRealMoney() == null ? other.getRealMoney() == null : this.getRealMoney().equals(other.getRealMoney()));
+            && (this.getRealMoney() == null ? other.getRealMoney() == null : this.getRealMoney().equals(other.getRealMoney()))
+            && (this.getPayOrderId() == null ? other.getPayOrderId() == null : this.getPayOrderId().equals(other.getPayOrderId()));
     }
 
     @Override
@@ -129,6 +135,7 @@ public class TbShopSongOrder implements Serializable {
         result = prime * result + ((getNote() == null) ? 0 : getNote().hashCode());
         result = prime * result + ((getShopId() == null) ? 0 : getShopId().hashCode());
         result = prime * result + ((getRealMoney() == null) ? 0 : getRealMoney().hashCode());
+        result = prime * result + ((getPayOrderId() == null) ? 0 : getPayOrderId().hashCode());
         return result;
     }
 
@@ -152,8 +159,9 @@ public class TbShopSongOrder implements Serializable {
         sb.append(", note=").append(note);
         sb.append(", shopId=").append(shopId);
         sb.append(", realMoney=").append(realMoney);
+        sb.append(", payOrderId=").append(payOrderId);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();
     }
-}
+}