Merge remote-tracking branch 'origin/test' into test

cash-common/cash-common-service/src/main/java/com/czg/order/entity/OrderDetail.java

@@ -67,6 +67,10 @@ public class OrderDetail implements Serializable {
      * 最终单价
      */
     private BigDecimal unitPrice;
+    /**
+     * 是否赠送 0否 1是
+     */
+    private Integer isGift;
 
     /**
      * 折扣金额(商品优惠券抵扣金额)
@@ -195,19 +199,6 @@ public class OrderDetail implements Serializable {
      */
     private LocalDateTime foodServeTime;
 
-    /**
-     * 是否赠送 0否 1是
-     */
-    @Column(ignore = true)
-    private Integer isGift = 0;
-
-
-    public void initGift() {
-        if (price.compareTo(BigDecimal.ZERO) == 0) {
-            isGift = 1;
-        }
-    }
-
     public BigDecimal getRefundNum() {
         return refundNum == null ? BigDecimal.ZERO : refundNum;
     }