各model数据库字段调整

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

@@ -368,7 +368,7 @@ public class Goods implements Serializable {
 	/**
 	 * 是否被推荐到店铺的首页
 	 */
-	@Column(name = "go_recommond")
+	@Column(name = "go_recommond", columnDefinition = "TINYINT(1)")
 	private Boolean isRecommond;
 
 	/**
@@ -466,7 +466,7 @@ public class Goods implements Serializable {
 	/**
 	 * 是否拆卖
 	 */
-	@Column(name = "go_isbreakup")
+	@Column(name = "go_isbreakup", columnDefinition = "TINYINT(1)")
 	private Boolean breakUp;
 
 	/**

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

@@ -141,7 +141,7 @@ public class GoodsHistory {
 	/**
 	 * 分段报价(JSON串) eg:[{"start":0,"end":1000,"price":2.3,"taxPrice":2.5},...]
 	 */
-	@Column(name = "go_qtyprice")
+	@Column(name = "go_qtyprice", length = 4000)
 	private String qtyPrice;
 
 	/**
@@ -382,7 +382,7 @@ public class GoodsHistory {
 	/**
 	 * 是否可拆卖
 	 */
-	@Column(name = "go_breakup")
+	@Column(name = "go_breakup", columnDefinition = "TINYINT(1)")
 	private Boolean breakUp;
 
 	/**

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

@@ -218,7 +218,7 @@ public class GoodsSimple {
 	/**
 	 * 是否拆卖
 	 */
-	@Column(name = "go_isbreakup")
+	@Column(name = "go_isbreakup", columnDefinition = "TINYINT(1)")
 	private Boolean breakUp;
 
 	/**

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

@@ -110,7 +110,7 @@ public class ProductStandardPutOnInfo {
      * true 自营
      * 是否自营
      */
-    @Column(name = "pro_selfSale")
+    @Column(name = "pro_selfSale", columnDefinition = "TINYINT(1)")
     private Boolean selfSale;
 
     /**
@@ -182,7 +182,7 @@ public class ProductStandardPutOnInfo {
     /**
      * 可上架数量是否变化
      */
-    @Column(name = "pro_availableonsalestatus")
+    @Column(name = "pro_availableonsalestatus", columnDefinition = "TINYINT(1)")
     private Boolean availableOnSaleStatus;
 
     /**

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

@@ -99,7 +99,7 @@ public class ProductStandardPutOnInfoHistory {
      * true 自营
      * 是否自营
      */
-    @Column(name = "pro_selfSale")
+    @Column(name = "pro_selfSale", columnDefinition = "TINYINT(1)")
     private Boolean isSelfSale;
 
     /**
@@ -135,7 +135,7 @@ public class ProductStandardPutOnInfoHistory {
     /**
      * 分段报价(JSON串) eg:[{"start":0,"end":1000,"price":2.3,"taxPrice":2.5},...]
      */
-    @Column(name = "go_qtyprice")
+    @Column(name = "go_qtyprice", length = 4000)
     private String qtyPrice;
 
     /**
@@ -171,7 +171,7 @@ public class ProductStandardPutOnInfoHistory {
     /**
      * 可上架数量是否变化
      */
-    @Column(name = "pro_availableonsalestatus")
+    @Column(name = "pro_availableonsalestatus", columnDefinition = "TINYINT(1)")
     private Boolean availableOnSaleStatus;
 
     /**

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

@@ -9,12 +9,6 @@ import org.codehaus.jackson.annotate.JsonIgnore;
 import org.springframework.util.StringUtils;
 
 import javax.persistence.*;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -123,7 +117,7 @@ public class ReleaseProductByBatch implements Serializable {
 	/**
 	 * 分段报价(JSON串) eg:[{"start":0,"end":1000,"price":2.3,"taxPrice":2.5},...]
 	 */
-	@Column(name = "rel_qtyprice")
+	@Column(name = "rel_qtyprice", length = 4000)
 	private String qtyPrice;
 
 	/**
@@ -159,7 +153,7 @@ public class ReleaseProductByBatch implements Serializable {
 	/**
 	 * 是否可拆卖
 	 */
-	@Column(name = "rel_breakup")
+	@Column(name = "rel_breakup", columnDefinition = "TINYINT(1)")
 	private Boolean breakUp;
 
 	/**

src/main/java/com/uas/platform/b2c/prod/store/model/ConsignmentAgreeRecord.java

@@ -57,7 +57,7 @@ public class ConsignmentAgreeRecord {
 	/**
 	 * 是否同意寄售协议
 	 */
-	@Column(name = "con_agreement")
+	@Column(name = "con_agreement", columnDefinition = "TINYINT(1)")
 	private Boolean agreement;
 
 	/**

src/main/java/com/uas/platform/b2c/prod/store/model/StoreViolations.java

@@ -59,7 +59,7 @@ public class StoreViolations {
 	/**
 	 * 违规处理记录是否处于当前违规申述处理流程
 	 */
-	@Column(name = "vi_current")
+	@Column(name = "vi_current", columnDefinition = "TINYINT(1)")
 	private Boolean current = true;
 
 	//***************************************************************
@@ -154,7 +154,7 @@ public class StoreViolations {
 	/**
 	 * 是否恢复店铺经营
 	 */
-	@Column(name = "vi_restore")
+	@Column(name = "vi_restore", columnDefinition = "TINYINT(1)")
 	private Boolean restore = false;
 
 	/**

src/main/java/com/uas/platform/b2c/trade/order/model/Order.java

@@ -183,7 +183,7 @@ public class Order extends Document implements Serializable {
     /**
 	 * 是否立即购买，还是先加入购物车，再购买
 	 */
-	@Column(name = "buy_now")
+	@Column(name = "buy_now", columnDefinition = "TINYINT(1)")
 	private Boolean buyNow;
 
 	/**
@@ -207,7 +207,7 @@ public class Order extends Document implements Serializable {
 	/**
 	 * 发票类型
 	 */
-	@Column(name = "or_invoicetype")
+	@Column(name = "or_invoicetype", columnDefinition = "TINYINT(1)")
 	private Integer invoicetype;
 
 	/**
@@ -361,7 +361,7 @@ public class Order extends Document implements Serializable {
 	/**
 	 * 转的发货单流水号
 	 */
-	@Column(name = "in_id", length = 50)
+	@Column(name = "in_id")
 	private String inid;
 
 	/**

src/main/java/com/uas/platform/b2c/trade/order/model/OrderIndex.java

@@ -33,7 +33,7 @@ import java.util.Set;
  * @version 2017-08-02 18:23:50 统一加标识字段 送样id
  */
 @Entity(name = "trade.OrderIndex")
-@Table(name = "trade$order")
+@Table(name = "trade$order_deprecated")
 public class OrderIndex extends Document implements Serializable {
 
 	private static final long serialVersionUID = 1L;
@@ -188,7 +188,7 @@ public class OrderIndex extends Document implements Serializable {
 	 * 转的发货单id
 	 */
 	@Column(name = "in_id")
-	private Long inid;
+	private String inid;
 
 	/**
 	 * 确认金额（考虑商城打折的情况）
@@ -798,7 +798,7 @@ public class OrderIndex extends Document implements Serializable {
 	 *
 	 * @return the inid
 	 */
-	public Long getInid() {
+	public String getInid() {
 		return inid;
 	}
 
@@ -807,7 +807,7 @@ public class OrderIndex extends Document implements Serializable {
 	 *
 	 * @param inid the inid
 	 */
-	public void setInid(Long inid) {
+	public void setInid(String inid) {
 		this.inid = inid;
 	}
 

src/main/java/com/uas/platform/b2c/trade/order/model/Purchase.java

@@ -222,7 +222,7 @@ public class Purchase extends Document implements Serializable {
 	/**
 	 * 是否买家提醒发货
 	 */
-	@Column(name = "pu_notifyship")
+	@Column(name = "pu_notifyship", columnDefinition = "TINYINT(1)")
 	private Boolean buyerNotifyShip;
 	
 	/**