Merge branch 'feature-toMysql-0920' into release-tomysql

# Conflicts:
#	src/main/java/com/uas/platform/b2c/prod/commodity/model/ReleaseProductByBatch.java
#	src/main/java/com/uas/platform/b2c/trade/order/model/Order.java

pom.xml

@@ -220,6 +220,12 @@
 			<groupId>com.oracle</groupId>
 			<artifactId>ojdbc6</artifactId>
 		</dependency>
+		<!-- mysql -->
+		<dependency>
+			<groupId>mysql</groupId>
+			<artifactId>mysql-connector-java</artifactId>
+			<version>5.1.21</version>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-orm</artifactId>

src/main/java/com/uas/platform/b2c/advertise/ad/model/StoreAds.java

@@ -10,10 +10,8 @@ import javax.persistence.Entity;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
 import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Index;
-import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 import java.util.Date;
@@ -33,8 +31,7 @@ public class StoreAds {
 	 * ID
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "store$ads_gen")
-	@SequenceGenerator(name = "store$ads_gen", sequenceName = "store$ads_seq", allocationSize = 1)
+	@GeneratedValue
 	@Column(name = "id")
 	private Long id;
 

src/main/java/com/uas/platform/b2c/advertise/ad/model/StoreContent.java

@@ -10,11 +10,9 @@ import javax.persistence.Entity;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
 import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
-import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 
@@ -33,8 +31,7 @@ public class StoreContent {
 	 * ID
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "store$content_gen")
-	@SequenceGenerator(name = "store$content_gen", sequenceName = "store$content_seq", allocationSize = 1)
+	@GeneratedValue
 	@Column(name = "id")
 	private Long id;
 

src/main/java/com/uas/platform/b2c/common/account/model/ErpB2cLog.java

@@ -27,8 +27,7 @@ public class ErpB2cLog extends BufferedLogable implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "log$erp_b2c_gen")
-	@SequenceGenerator(name = "log$erp_b2c_gen", sequenceName = "log$erp_b2c_seq", allocationSize = 1)
+	@GeneratedValue
 	@Column(name = "log_id")
 	private Long id;
 
@@ -64,7 +63,8 @@ public class ErpB2cLog extends BufferedLogable implements Serializable {
 	/**
 	 * 具体内容
 	 */
-	@Column(name = "log_message")
+	@Lob
+	@Column(name = "log_message", columnDefinition = "TEXT")
 	private String message;
 
 	/**

src/main/java/com/uas/platform/b2c/common/account/model/Resource.java

@@ -25,8 +25,7 @@ public class Resource implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "sec$resources_gen_b2c")
-	@SequenceGenerator(name = "sec$resources_gen_b2c", sequenceName = "sec$resources_seq_b2c", allocationSize = 1)
+	@GeneratedValue
 	@Column(name = "res_id")
 	private Long id;
 

src/main/java/com/uas/platform/b2c/common/account/model/ResourceItem.java

@@ -24,8 +24,7 @@ public class ResourceItem implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "sec$resourceitems_gen_b2c")
-	@SequenceGenerator(name = "sec$resourceitems_gen_b2c", sequenceName = "sec$resourceitems_seq_b2c", allocationSize = 1)
+	@GeneratedValue
 	@Column(name = "item_id")
 	private Long id;
 

src/main/java/com/uas/platform/b2c/common/account/model/Role.java

@@ -23,8 +23,7 @@ public class Role implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "sec$roles_gen_b2c")
-	@SequenceGenerator(name = "sec$roles_gen_b2c", sequenceName = "sec$roles_seq_b2c", allocationSize = 1)
+	@GeneratedValue
 	@Column(name = "role_id")
 	private Long id;
 

src/main/java/com/uas/platform/b2c/common/account/model/SigninLog.java

@@ -26,8 +26,7 @@ public class SigninLog implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "log$signin_b2c_gen")
-	@SequenceGenerator(name = "log$signin_b2c_gen", sequenceName = "log$signin_b2c_seq", allocationSize = 1)
+	@GeneratedValue
 	@Column(name = "log_id")
 	private Long id;
 

src/main/java/com/uas/platform/b2c/common/account/model/TradeLog.java

@@ -23,8 +23,7 @@ public class TradeLog extends BufferedLogable implements Serializable {
 	private static final long serialVersionUID = 6066338442401737012L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "TRADE$LOG_VOUCHER_GEN")
-	@SequenceGenerator(name = "TRADE$LOG_VOUCHER_GEN", sequenceName = "TRADE$LOG_VOUCHER_SEQ", allocationSize = 1)
+	@GeneratedValue
 	@Column(name = "log_id")
 	private Long id;
 
@@ -79,7 +78,8 @@ public class TradeLog extends BufferedLogable implements Serializable {
 	 * 2、状态变更时，记录其状态变更以及受影响的单据编号
 	 * 3、启动异常流程时，记录异常单据的
 	 */
-	@Column(name = "log_change_log",length = 4000)
+	@Lob
+	@Column(name = "log_change_log", columnDefinition = "TEXT")
 	private String changeLog;
 
 	public enum VoucherOperation {

src/main/java/com/uas/platform/b2c/common/account/model/UsageLog.java

@@ -27,8 +27,7 @@ public class UsageLog extends BufferedLogable implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "log$usage_b2c_gen")
-	@SequenceGenerator(name = "log$usage_b2c_gen", sequenceName = "log$usage_b2c_seq", allocationSize = 1)
+	@GeneratedValue
 	@Column(name = "log_id")
 	private Long id;
 

src/main/java/com/uas/platform/b2c/common/account/model/User.java

@@ -43,8 +43,7 @@ public class User implements Serializable {
 	 * uu号，ID
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "users_gen")
-	@SequenceGenerator(name = "users_gen", sequenceName = "users_seq", allocationSize = 1)
+	@GeneratedValue
 	@Column(name = "user_uu")
 	private Long userUU;
 

src/main/java/com/uas/platform/b2c/common/help/dao/HelpNavDao.java

@@ -27,7 +27,7 @@ public interface HelpNavDao extends JpaSpecificationExecutor<HelpNav>, JpaReposi
      * @param parentId 父导航id
      * @return 子导航最大序号
      */
-    @Query("select nvl(max(h.detno),0) from HelpNav h where h.parentId = :parentId")
+    @Query("select coalesce(max(h.detno),0) from HelpNav h where h.parentId = :parentId")
     Short findMaxDetno(@Param("parentId") Long parentId);
 
     /**

src/main/java/com/uas/platform/b2c/common/help/model/HelpIssue.java

@@ -3,10 +3,8 @@ package com.uas.platform.b2c.common.help.model;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Lob;
-import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 import java.io.Serializable;
 import java.util.Date;
@@ -30,8 +28,7 @@ public class HelpIssue implements Serializable{
      */
     @Id
     @Column(name = "hi_id")
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "help$issus_active_gen")
-    @SequenceGenerator(name = "help$issus_active_gen", sequenceName = "help$issus_active_seq", allocationSize = 1)
+    @GeneratedValue
     private Long id;
 
     /**

src/main/java/com/uas/platform/b2c/common/help/model/HelpIssueInfo.java

@@ -3,9 +3,7 @@ package com.uas.platform.b2c.common.help.model;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 import java.util.Date;
 
@@ -23,8 +21,7 @@ public class HelpIssueInfo{
      */
     @Id
     @Column(name = "hi_id")
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "help$issus_active_gen")
-    @SequenceGenerator(name = "help$issus_active_gen", sequenceName = "help$issus_active_seq", allocationSize = 1)
+    @GeneratedValue
     private Long id;
 
     /**

src/main/java/com/uas/platform/b2c/common/help/model/HelpNav.java

@@ -3,9 +3,7 @@ package com.uas.platform.b2c.common.help.model;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 import java.io.Serializable;
@@ -30,8 +28,7 @@ public class HelpNav implements Serializable{
      */
     @Id
     @Column(name = "hp_id")
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "help$nav_active_gen")
-    @SequenceGenerator(name = "help$nav_active_gen", sequenceName = "help$nav_active_seq", allocationSize = 1)
+    @GeneratedValue
     private Long id;
 
     /**

src/main/java/com/uas/platform/b2c/common/message/model/MessageBoard.java

@@ -7,13 +7,11 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.OneToMany;
 import javax.persistence.OneToOne;
 import javax.persistence.OrderBy;
-import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 import java.io.Serializable;
 import java.util.Date;
@@ -32,8 +30,7 @@ public class MessageBoard implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "opt$messageboard_gen")
-	@SequenceGenerator(name = "opt$messageboard_gen", sequenceName = "opt$messageboard_seq", allocationSize = 1)
+	@GeneratedValue
 	@Column(name = "mb_id")
 	private Long id;
 

src/main/java/com/uas/platform/b2c/common/message/model/MessageBoardImg.java

@@ -3,9 +3,7 @@ package com.uas.platform.b2c.common.message.model;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 
 /**
@@ -19,8 +17,7 @@ public class MessageBoardImg {
     private static final long serialVersionUID = 1L;
 
     @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "opt$messageboard_img_gen")
-    @SequenceGenerator(name = "opt$messageboard_img_gen", sequenceName = "opt$messageboard_img_seq", allocationSize = 1)
+    @GeneratedValue
     @Column(name = "mbi_id")
     private Long id;
 

src/main/java/com/uas/platform/b2c/common/message/model/MessageInfo.java

@@ -3,9 +3,7 @@ package com.uas.platform.b2c.common.message.model;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 import java.util.Date;
 
@@ -20,8 +18,7 @@ import java.util.Date;
 public class MessageInfo {
 
     @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "trade$message_gen")
-    @SequenceGenerator(name = "trade$message_gen", sequenceName = "trade$message_seq", allocationSize = 1)
+    @GeneratedValue
     @Column(name = "message_id")
     private Long id;
 

src/main/java/com/uas/platform/b2c/external/erp/product/model/OperationInfo.java

@@ -24,8 +24,6 @@ public class OperationInfo implements Serializable {
      */
     @Id
     @Column(name = "id")
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "sys$service_message_gen")
-    @SequenceGenerator(name = "sys$service_message_gen", sequenceName = "sys$service_message_seq", allocationSize = 1)
     private Long id;
 
     /**
@@ -85,7 +83,8 @@ public class OperationInfo implements Serializable {
     /**
      * 备注信息
      */
-    @Column(name = "sm_operationremark", length = 4000)
+    @Lob
+    @Column(name = "sm_operationremark", columnDefinition = "TEXT")
     private String operationRemark;
 
     /**

src/main/java/com/uas/platform/b2c/fa/payment/model/BankInfo.java

@@ -23,8 +23,7 @@ public class BankInfo implements Serializable{
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "trade$bank_info_gen")
-	@SequenceGenerator(name = "trade$bank_info_gen", sequenceName = "trade$bank_info_seq", allocationSize = 1)
+	@GeneratedValue
 	@Column(name = "binfo_id")
 	private Long id;
 

src/main/java/com/uas/platform/b2c/fa/payment/model/BankTransAssociate.java

@@ -5,9 +5,7 @@ import java.io.Serializable;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 
 /** 
@@ -28,8 +26,7 @@ public class BankTransAssociate implements Serializable{
 	  * 主键ID
 	  */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "trade$banktrans_associate_gen")
-	@SequenceGenerator(name="trade$banktrans_associate_gen", sequenceName = "trade$banktrans_associate_seq", allocationSize = 1)
+	@GeneratedValue
 	@Column(name = "bka_id")
 	private Long id;
 	

src/main/java/com/uas/platform/b2c/fa/payment/model/BankTransfer.java

@@ -14,15 +14,14 @@ import java.util.Date;
 public class BankTransfer {
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "trade$bank_transfer_gen")
-	@SequenceGenerator(name = "trade$bank_transfer_gen", sequenceName = "trade$bank_transfer_seq", allocationSize = 1)
+	@GeneratedValue
 	@Column(name = "banktf_id")
 	private Long id;
 
 	/**
 	 * 收款方银行信息
 	 */
-	@Column(name = "banktf_re", length = 4000)
+	@Column(name = "banktf_re", columnDefinition = "TEXT")
 	private String jsonReceive;
 
 	/**
@@ -64,7 +63,7 @@ public class BankTransfer {
 	/**
 	 * 付款方银行信息
 	 */
-	@Column(name = "banktf_pa", length = 4000)
+	@Column(name = "banktf_pa", columnDefinition = "TEXT")
 	private String jsonPament;
 
 	/**

src/main/java/com/uas/platform/b2c/fa/payment/model/Payment.java

@@ -14,8 +14,7 @@ import java.util.Set;
 public class Payment {
 
     @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "trade$payment_order_gen")
-    @SequenceGenerator(name = "trade$payment_order_gen", sequenceName = "trade$payment_order_seq", allocationSize = 1)
+    @GeneratedValue
     @Column(name = "id")
     private Long id;
 
@@ -53,7 +52,7 @@ public class Payment {
      *  付款总金额
      */
     @Column(name = "pay_total_amount")
-    private double totalAmount;
+    private Double totalAmount;
 
     /**
      *  付款时间
@@ -115,11 +114,11 @@ public class Payment {
         this.createtime = createtime;
     }
 
-    public double getTotalAmount() {
+    public Double getTotalAmount() {
         return totalAmount;
     }
 
-    public void setTotalAmount(double totalAmount) {
+    public void setTotalAmount(Double totalAmount) {
         this.totalAmount = totalAmount;
     }
 

src/main/java/com/uas/platform/b2c/fa/payment/model/PaymentDetail.java

@@ -11,8 +11,7 @@ import javax.persistence.*;
 public class PaymentDetail {
 
     @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "trade$payment_detail_gen")
-    @SequenceGenerator(name = "trade$payment_detail_gen", sequenceName = "trade$payment_detail_seq", allocationSize = 1)
+    @GeneratedValue
     @Column(name = "id")
     private Long id;
 

src/main/java/com/uas/platform/b2c/fa/payment/model/TradeRecordChart.java

@@ -26,8 +26,7 @@ public class TradeRecordChart implements Serializable {
 	 */
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "trade$payment_gen")
-	@SequenceGenerator(name = "trade$payment_gen", sequenceName = "trade$payment_seq", allocationSize = 1)
+	@GeneratedValue
 	@Column(name = "id")
 	private Long id;
 

src/main/java/com/uas/platform/b2c/fa/settlement/model/Bill.java

@@ -14,8 +14,7 @@ public class Bill implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "trade$bill_gen")
-	@SequenceGenerator(name = "trade$bill_gen", sequenceName = "trade$bill_seq", allocationSize = 1)
+	@GeneratedValue
 	@Column(name = "bill_id")
 	private Long id;
 

src/main/java/com/uas/platform/b2c/fa/settlement/model/BillInfo.java

@@ -5,9 +5,7 @@ import java.io.Serializable;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 
 /**
@@ -23,8 +21,7 @@ public class BillInfo implements Serializable{
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "trade$bill_gen")
-	@SequenceGenerator(name = "trade$bill_gen", sequenceName = "trade$bill_seq", allocationSize = 1)
+	@GeneratedValue
 	@Column(name = "bill_id")
 	private Long id;
 	

src/main/java/com/uas/platform/b2c/fa/settlement/model/Refund.java

@@ -14,11 +14,9 @@ import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
 import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.OneToMany;
 import javax.persistence.OrderBy;
-import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -40,8 +38,7 @@ public class Refund implements Serializable{
 	
 	@Id
 	@Column(name = "id")
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "trade$refund_gen")
-	@SequenceGenerator(name = "trade$refund_gen", allocationSize = 1, sequenceName = "trade$refund_seq")
+	@GeneratedValue
 	private Long id;
 
 	//*************************************************************************

src/main/java/com/uas/platform/b2c/fa/settlement/model/RefundDetail.java

@@ -13,12 +13,10 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToOne;
-import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 
 
@@ -36,8 +34,7 @@ public class RefundDetail extends Document implements Serializable{
 	
 	@Id
 	@Column(name = "id")
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "trade$refunddeail_gen")
-	@SequenceGenerator(name = "trade$refunddeail_gen", sequenceName = "trade$refunddeail_seq", allocationSize = 1)
+	@GeneratedValue
 	private Long id;
 	
 	/**

src/main/java/com/uas/platform/b2c/fa/settlement/model/RequestPayment.java

@@ -22,8 +22,7 @@ public class RequestPayment extends Document {
 
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "trade$request_payment_gen")
-	@SequenceGenerator(name = "trade$request_payment_gen", sequenceName = "trade$request_payment_gen", allocationSize = 1)
+	@GeneratedValue
 	@Column(name = "id")
 	private Long id;
 

src/main/java/com/uas/platform/b2c/logistics/model/Address.java

@@ -16,8 +16,7 @@ import javax.persistence.*;
 public class Address {
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "trade$address_gen")
-	@SequenceGenerator(name = "trade$address_gen", sequenceName = "trade$address_seq", allocationSize = 1)
+	@GeneratedValue
 	@Column(name = "add_id")
 	private Long id;
 

src/main/java/com/uas/platform/b2c/logistics/model/AddressTakeSelf.java

@@ -15,8 +15,7 @@ public class AddressTakeSelf {
 	 * 主键 ID
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "trade$address_take_gen")
-	@SequenceGenerator(name = "trade$address_take_gen", sequenceName = "trade$address_take_seq", allocationSize = 1)
+	@GeneratedValue
 	@Column(name = "take_id")
 	private Long id;
 

src/main/java/com/uas/platform/b2c/logistics/model/DistributionRule.java

@@ -21,8 +21,7 @@ public class DistributionRule {
 	 * 主键id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "logistics$distributor_gen")
-	@SequenceGenerator(name = "logistics$distributor_gen", sequenceName = "logistics$distributor_seq", allocationSize = 1)
+	@GeneratedValue
 	@Column(name = "rule_id")
 	private Long id;
 
@@ -98,7 +97,7 @@ public class DistributionRule {
 	/**
 	 * 分段运费（JSON串）
 	 */
-	@Column(name = "rule_qtyFare")
+	@Column(name = "rule_qtyFare", columnDefinition = "TEXT")
 	private String qtyFare;
 
 	/**
@@ -116,7 +115,7 @@ public class DistributionRule {
 	/**
 	 * 分段地区（JSON串）
 	 */
-	@Column(name = "rule_qtyArea")
+	@Column(name = "rule_qtyArea", columnDefinition = "TEXT")
 	private String qtyArea;
 
 	/**

src/main/java/com/uas/platform/b2c/logistics/model/DistributorSeller.java

@@ -12,8 +12,7 @@ import java.util.Date;
 public class DistributorSeller {
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "logistics$seller_distributor_gen")
-	@SequenceGenerator(name = "logistics$seller_distributor_gen", sequenceName = "logistics$seller_distributor_seq", allocationSize = 1)
+	@GeneratedValue
 	@Column(name = "seller_id")
 	private Long id;
 

src/main/java/com/uas/platform/b2c/logistics/model/Invoice.java

@@ -15,13 +15,11 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.OneToMany;
 import javax.persistence.OneToOne;
 import javax.persistence.OrderBy;
-import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 import java.io.Serializable;
 import java.util.Date;
@@ -42,8 +40,7 @@ public class Invoice extends Document implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "trade$invoice_gen")
-	@SequenceGenerator(name = "trade$invoice_gen", sequenceName = "trade$invoice_seq", allocationSize = 1)
+	@GeneratedValue
 	@Column(name = "id")
 	private Long id;
 

src/main/java/com/uas/platform/b2c/logistics/model/InvoiceDetail.java

@@ -4,11 +4,9 @@ import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
-import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 
 import com.uas.platform.b2c.trade.aftersale.model.ChangeFB2cDetail;
@@ -30,8 +28,7 @@ import com.uas.platform.core.persistence.StatusColumn;
 public class InvoiceDetail {
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "trade$invoice_detail_gen")
-	@SequenceGenerator(name = "trade$invoice_detail_gen", sequenceName = "trade$invoice_detail_seq", allocationSize = 1)
+	@GeneratedValue
 	@Column(name = "id")
 	private Long id;
 

src/main/java/com/uas/platform/b2c/logistics/model/InvoiceFOrder.java

@@ -14,13 +14,11 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.OneToMany;
 import javax.persistence.OneToOne;
 import javax.persistence.OrderBy;
-import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 import java.io.Serializable;
 import java.util.Date;
@@ -42,8 +40,7 @@ public class InvoiceFOrder extends Document implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "trade$invoice_fmor_gen")
-	@SequenceGenerator(name = "trade$invoice_fmor_gen", sequenceName = "trade$invoice_fmor_gen", allocationSize = 1)
+	@GeneratedValue
 	@Column(name = "id")
 	private Long id;
 

src/main/java/com/uas/platform/b2c/logistics/model/InvoiceFOrderDetail.java

@@ -12,11 +12,9 @@ import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
-import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 
 /**
@@ -30,8 +28,7 @@ import javax.persistence.Table;
 public class InvoiceFOrderDetail {
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "trade$invoice_fmor_dt_gen")
-	@SequenceGenerator(name = "trade$invoice_fmor_dt_gen", sequenceName = "trade$invoice_fmor_dt_gen", allocationSize = 1)
+	@GeneratedValue
 	@Column(name = "id")
 	private Long id;
 

src/main/java/com/uas/platform/b2c/logistics/model/InvoiceFPurchase.java

@@ -13,13 +13,11 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.OneToMany;
 import javax.persistence.OneToOne;
 import javax.persistence.OrderBy;
-import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 import java.io.Serializable;
@@ -40,8 +38,7 @@ public class InvoiceFPurchase extends Document implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "trade$invoice_fmpu_gen")
-	@SequenceGenerator(name = "trade$invoice_fmpu_gen", sequenceName = "trade$invoice_fmpu_gen", allocationSize = 1)
+	@GeneratedValue
 	@Column(name = "id")
 	private Long id;
 

src/main/java/com/uas/platform/b2c/logistics/model/InvoiceFPurchaseDetail.java

@@ -10,11 +10,9 @@ import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
-import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 
 /**
@@ -28,8 +26,7 @@ import javax.persistence.Table;
 public class InvoiceFPurchaseDetail {
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "trade$invoice_fmpu_dt_gen")
-	@SequenceGenerator(name = "trade$invoice_fmpu_dt_gen", sequenceName = "trade$invoice_fmpu_dt_gen", allocationSize = 1)
+	@GeneratedValue
 	@Column(name = "id")
 	private Long id;
 

src/main/java/com/uas/platform/b2c/logistics/model/Logistics.java

@@ -5,9 +5,7 @@ import java.io.Serializable;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 
 /**
@@ -23,8 +21,7 @@ public class Logistics implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "trade$logistics_gen")
-	@SequenceGenerator(name = "trade$logistics_gen", sequenceName = "trade$logistics_gen", allocationSize = 1)
+	@GeneratedValue
 	@Column(name = "id")
 	private Long id;
 

src/main/java/com/uas/platform/b2c/logistics/model/LogisticsCompanyCode.java

@@ -6,9 +6,7 @@ import java.net.URLDecoder;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 
 /**
@@ -22,8 +20,7 @@ import javax.persistence.Table;
 public class LogisticsCompanyCode {
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "trade$lgt_company_code_gen")
-	@SequenceGenerator(name = "trade$lgt_company_code_gen", sequenceName = "trade$lgt_company_code_seq", allocationSize = 1)
+	@GeneratedValue
 	private Long id;
 
 	/**

src/main/java/com/uas/platform/b2c/logistics/model/LogisticsInfo.java

@@ -3,9 +3,7 @@ package com.uas.platform.b2c.logistics.model;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 
 /**
@@ -21,8 +19,7 @@ public class LogisticsInfo {
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "trade$logistics_inf_gen")
-	@SequenceGenerator(name = "trade$logistics_inf_gen", sequenceName = "trade$logistics_inf_seq", allocationSize = 1)
+	@GeneratedValue
 	@Column(name = "id")
 	private Long id;
 

src/main/java/com/uas/platform/b2c/logistics/model/LogisticsInfoOld.java

@@ -3,9 +3,7 @@ package com.uas.platform.b2c.logistics.model;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 
 @Entity(name = "trade.logisticsInfo")
@@ -15,8 +13,7 @@ public class LogisticsInfoOld {
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "trade$logisticsInfo_gen")
-	@SequenceGenerator(name = "trade$logisticsInfo_gen", sequenceName = "trade$logisticsInfo_seq", allocationSize = 1)
+	@GeneratedValue
 	@Column(name = "logisticsInfo_id")
 	private Long id;
 

src/main/java/com/uas/platform/b2c/logistics/model/PickUpAddress.java

@@ -3,9 +3,7 @@ package com.uas.platform.b2c.logistics.model;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 
 
@@ -21,8 +19,7 @@ import javax.persistence.Table;
 public class PickUpAddress{
 	
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "pickup$address_gen")
-	@SequenceGenerator(name = "pickup$address_gen", sequenceName = "pickup$address_seq", allocationSize = 1)
+	@GeneratedValue
 	@Column(name = "add_id")
 	private Long id;
 	

src/main/java/com/uas/platform/b2c/logistics/model/Receipt.java

@@ -19,11 +19,9 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.OneToMany;
 import javax.persistence.OrderBy;
-import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 import java.io.Serializable;
 import java.util.Date;
@@ -43,8 +41,7 @@ public class Receipt extends Document implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "trade$receipt_gen")
-	@SequenceGenerator(name = "trade$receipt_gen", sequenceName = "trade$receipt_gen", allocationSize = 1)
+	@GeneratedValue
 	@Column(name = "id")
 	private Long id;
 

src/main/java/com/uas/platform/b2c/logistics/model/ReceiptDetail.java

@@ -4,11 +4,9 @@ import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
-import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 
 import com.uas.platform.b2c.trade.aftersale.model.ChangeFB2cDetail;
@@ -33,8 +31,7 @@ import com.uas.platform.core.persistence.StatusColumn;
 public class ReceiptDetail {
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "trade$receipt_detail_gen")
-	@SequenceGenerator(name = "trade$receipt_detail_gen", sequenceName = "trade$receipt_detail_gen", allocationSize = 1)
+	@GeneratedValue
 	@Column(name = "id")
 	private Long id;
 

src/main/java/com/uas/platform/b2c/logistics/model/SellerLogisticsInfo.java

@@ -13,8 +13,7 @@ public class SellerLogisticsInfo {
 	 * 唯一标识id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "logistics$seller_gen")
-	@SequenceGenerator(name = "logistics$seller_gen", sequenceName = "logistics$seller_seq", allocationSize = 1)
+	@GeneratedValue
 	@Column(name = "id")
 	private Long id;
 

src/main/java/com/uas/platform/b2c/prod/commodity/dao/GoodsDao.java

@@ -80,7 +80,7 @@ public interface GoodsDao extends JpaSpecificationExecutor<Goods>, JpaRepository
      * @param status the status 状态
      * @return double
      */
-    @Query("select sum(nvl(g.reserve, 0)) from Goods g where g.uuid=:uuid and g.status =:status")
+    @Query("select sum(coalesce(g.reserve)) from Goods g where g.uuid=:uuid and g.status =:status")
 	Double findTotalReserveByUuid(@Param("uuid") String uuid, @Param("status") Integer status);
 
     /**
@@ -199,7 +199,7 @@ public interface GoodsDao extends JpaSpecificationExecutor<Goods>, JpaRepository
      * @param status the status 状态
      * @return double
      */
-    @Query("select sum(nvl(g.sampleQty, 0) - nvl(g.sampleAppliedQty, 0)) from Goods g where g.uuid=:uuid and g.status =:status")
+    @Query("select sum(coalesce(g.sampleQty, 0) - coalesce(g.sampleAppliedQty, 0)) from Goods g where g.uuid=:uuid and g.status =:status")
 	Double findAvailableSampleQtyByUuid(@Param("uuid") String uuid, @Param("status") Integer status);
 
     /**
@@ -209,7 +209,7 @@ public interface GoodsDao extends JpaSpecificationExecutor<Goods>, JpaRepository
      * @param status the status 状态
      * @return double
      */
-    @Query("select sum(nvl(g.reserve, 0)) from Goods g where g.uuid=:uuid and g.original=1311 and g.status =:status")
+    @Query("select sum(coalesce(g.reserve, 0)) from Goods g where g.uuid=:uuid and g.original=1311 and g.status =:status")
 	Double findOriginalQtyByUuid(@Param("uuid") String uuid, @Param("status") Integer status);
 
     /**
@@ -219,7 +219,7 @@ public interface GoodsDao extends JpaSpecificationExecutor<Goods>, JpaRepository
      * @param status the status 状态
      * @return double
      */
-    @Query("select sum(nvl(g.reserve, 0)) from Goods g where g.uuid=:uuid and g.original=1312 and g.status =:status")
+    @Query("select sum(coalesce(g.reserve, 0)) from Goods g where g.uuid=:uuid and g.original=1312 and g.status =:status")
 	Double findInactionStockQtyByUuid(@Param("uuid") String uuid, @Param("status") Integer status);
 
     /**
@@ -229,7 +229,7 @@ public interface GoodsDao extends JpaSpecificationExecutor<Goods>, JpaRepository
      * @param status the status 状态
      * @return double
      */
-    @Query(value = "select sum(nvl(g.sampleAppliedQty, 0)) from Goods g where g.uuid=:uuid and g.status =:status")
+    @Query(value = "select sum(coalesce(g.sampleAppliedQty, 0)) from Goods g where g.uuid=:uuid and g.status =:status")
 	Double findApplyedSampleQty(@Param("uuid") String uuid, @Param("status") Integer status);
 
 	/**
@@ -248,7 +248,7 @@ public interface GoodsDao extends JpaSpecificationExecutor<Goods>, JpaRepository
      * @param qty the qty 数量
      * @return list
      */
-    @Query(value = "select * from (select * from trade$goods g where nvl(g.go_sampleqty, 0) - nvl(g.go_sampleappliedqty, 0) >0 order by go_id desc) where rownum<=:qty", nativeQuery = true)
+    @Query(value = "select * from (select * from trade$goods g where coalesce(g.go_sampleqty, 0) - coalesce(g.go_sampleappliedqty, 0) >0 order by go_id desc) where rownum<=:qty", nativeQuery = true)
 	List<Goods> findAvailableSampleQty(@Param("qty") Integer qty);
 
     /**
@@ -361,7 +361,7 @@ public interface GoodsDao extends JpaSpecificationExecutor<Goods>, JpaRepository
      * @param storeid the storeid 店铺uuid
      * @return double
      */
-    @Query(value = "select sum(nvl(g.reserve, 0)) from Goods g where g.enUU =:enUU and g.storeid =:storeid")
+    @Query(value = "select sum(coalesce(g.reserve, 0)) from Goods g where g.enUU =:enUU and g.storeid =:storeid")
 	Double findSumReserveByEnuuAndStoreid(@Param("enUU") Long enuu, @Param("storeid") String storeid);
 
     /**
@@ -379,7 +379,7 @@ public interface GoodsDao extends JpaSpecificationExecutor<Goods>, JpaRepository
      * @param enuu the enuu 企业的enuu
      * @return double
      */
-    @Query(value = "select sum(g.reserve * nvl(g.maxPriceRMB, 0)) from Goods g where g.enUU =:enUU")
+    @Query(value = "select sum(g.reserve * coalesce(g.maxPriceRMB, 0)) from Goods g where g.enUU =:enUU")
 	public Double findSumRMBByEnuu(@Param("enUU") Long enuu);
 
     /**

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

@@ -38,8 +38,7 @@ public class Goods implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "trade$goods_gen")
-	@SequenceGenerator(name = "trade$goods_gen", sequenceName = "trade$goods_seq", allocationSize = 1)
+	@GeneratedValue
 	@Column(name = "go_id")
 	private Long id;
 
@@ -282,7 +281,7 @@ public class Goods implements Serializable {
 	/**
 	 * 封装
 	 */
-	@Column(name = "go_encapsulation ")
+	@Column(name = "go_encapsulation")
 	private String encapsulation;
 
 	/**

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

@@ -18,8 +18,7 @@ import java.util.List;
 public class GoodsHistory {
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "trade$goods_history_gen")
-	@SequenceGenerator(name = "trade$goods_history_gen", sequenceName = "trade$goods_history_seq", allocationSize = 1)
+	@GeneratedValue
 	@Column(name = "go_id")
 	private Long id;
 
@@ -196,7 +195,7 @@ public class GoodsHistory {
 	/**
 	 * 封装
 	 */
-	@Column(name = "go_encapsulation ")
+	@Column(name = "go_encapsulation")
 	private String encapsulation;
 
 	/**

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

@@ -15,8 +15,7 @@ import java.math.BigDecimal;
 public class GoodsPriceInfo {
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "trade$goods_price_gen")
-	@SequenceGenerator(name = "trade$goods_price_gen", sequenceName = "trade$goods_price_seq", allocationSize = 1)
+	@GeneratedValue
 	@Column(name = "gp_id")
 	private Long id;
 

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

@@ -18,8 +18,7 @@ import java.util.Date;
 public class PriceChangeLog{
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "log$price_changes_gen")
-	@SequenceGenerator(name = "log$price_changes_gen", sequenceName = "log$price_changes_seq", allocationSize = 1)
+	@GeneratedValue
 	@Column(name = "log_id")
 	private Long id;
 

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

@@ -14,15 +14,16 @@ import java.util.Set;
  *
  */
 @Entity
-@Table(name = "products")
+@Table(name = "products", indexes = {@Index(name = "products_code_index", columnList = "pr_code"),
+@Index(name = "products_enuu_index", columnList = "pr_enuu"),
+@Index(name = "products_enuu_code_index", columnList = "pr_code, pr_enuu", unique = true)})
 @Logger
 //@Cacheable
 //@org.hibernate.annotations.Cache(usage = CacheConcurrencyStrategy.READ_WRITE, region = "com.uas.platform.b2b.model.Product")
 public class Product {
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "products_gen")
-	@SequenceGenerator(name = "products_gen", sequenceName = "products_seq", allocationSize = 1)
+	@GeneratedValue
 	@Column(name = "pr_id")
 	private Long id;
 

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

@@ -17,8 +17,7 @@ import java.util.Set;
 public class ProductImportHist {
 
     @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "product_import_gen")
-    @SequenceGenerator(name = "product_import_gen", sequenceName = "product_import_seq", allocationSize = 1)
+    @GeneratedValue
     @Column(name = "id")
     private Long id;
 

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

@@ -16,8 +16,7 @@ import javax.persistence.*;
 public class ProductImportHistItem {
 
     @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "product_import_hist_gen")
-    @SequenceGenerator(name = "product_import_hist_gen", allocationSize = 1, sequenceName = "product_import_hist_seq")
+    @GeneratedValue
     @Column(name = "id")
     private Long id;
 

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

@@ -22,8 +22,7 @@ public class ProductMatchResult implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "productmatchresults_gen")
-	@SequenceGenerator(name = "productmatchresults_gen", sequenceName = "productmatchresults_seq", allocationSize = 1)
+	@GeneratedValue
 	@Column(name = "pr_id")
 	private Long id;
 	

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

@@ -15,8 +15,7 @@ import java.util.Date;
 public class ProductModifyHistory {
 
     @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "product$mod_history_gen")
-    @SequenceGenerator(name = "product$mod_history_gen", sequenceName = "product$mod_history_seq", allocationSize = 1)
+    @GeneratedValue
     @Column(name = "mod_id")
     private Long id;
 

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

@@ -9,9 +9,7 @@ import org.springframework.util.StringUtils;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 import java.util.Date;
@@ -26,8 +24,7 @@ import java.util.List;
 public class ProductStandardPutOnInfo {
 
 
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "trade$prodstanputon_gen")
-    @SequenceGenerator(allocationSize = 1, sequenceName = "trade$prodstanputon_seq", name = "trade$prodstanputon_gen")
+    @GeneratedValue
     @Id
     @Column(name ="id")
     private Long id;

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

@@ -9,9 +9,7 @@ import com.uas.platform.b2c.core.support.SystemSession;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 import java.util.Date;
@@ -23,8 +21,7 @@ public class ProductStandardPutOnInfoHistory {
 
     @Id
     @Column(name ="id")
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "trade$prodstandardputon_gen")
-    @SequenceGenerator(allocationSize = 1, sequenceName = "trade$prodstandardputon_seq", name = "trade$prodstandardputon_gen")
+    @GeneratedValue
     private Long id;
 
     /**

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

@@ -21,8 +21,7 @@ public class ProductStoreStatus implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "product$storestaus_gen")
-	@SequenceGenerator(name = "product$storestaus_gen", sequenceName = "product$storestaus_seq", allocationSize = 1)
+	@GeneratedValue
 	@Column(name = "pr_id")
 	private Long id;
 

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

@@ -9,6 +9,12 @@ 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;
@@ -35,8 +41,7 @@ public class ReleaseProductByBatch implements Serializable {
 	 */
 	@Id
 	@Column(name = "rel_id")
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "trade$releasebybatch_gen")
-	@SequenceGenerator(name = "trade$releasebybatch_gen", sequenceName = "trade$releasebybatch_seq", allocationSize = 1)
+	@GeneratedValue
 	private Long id;
 
 	// 当前的申请的这一批的单号

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

@@ -14,8 +14,7 @@ import java.util.Date;
 public class StockInOutHist {
 
     @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "trade$stock_in_out_gen")
-    @SequenceGenerator(name = "trade$stock_in_out_gen", allocationSize = 1, sequenceName = "trade$stock_in_out_seq")
+    @GeneratedValue
     @Column(name = "id")
     private Long id;
 

src/main/java/com/uas/platform/b2c/prod/product/brand/modal/Brand.java

@@ -13,7 +13,7 @@ import java.util.Date;
  * @version  2016年3月11日上午9:30:00 suntg 创建
  */
 @Entity
-@Table(name = "product$brand")
+@Table(name = "product$brand", indexes = { @Index(name = "product$brand_inital", columnList = "br_inital"), @Index(name = "product$brand_namecn_uni", columnList = "br_name_cn", unique = true), @Index(name = "product$brand_nameen_uni", columnList = "br_name_en", unique = true)})
 public class Brand implements Serializable {
 
 	/**
@@ -26,8 +26,7 @@ public class Brand implements Serializable {
 	 */
 	@Id
 	@Column(name = "br_id")
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "product$brand_active_gen")
-	@SequenceGenerator(name = "product$brand_active_gen", sequenceName = "product$brand_active_seq", allocationSize = 1)
+	@GeneratedValue
 	private Long id;
 
 	/**
@@ -39,13 +38,13 @@ public class Brand implements Serializable {
 	/**
 	 * 品牌中文名称
 	 */
-	@Column(name = "br_name_cn")
+	@Column(name = "br_name_cn", unique = true)
 	private String nameCn;
 
 	/**
 	 * 品牌英文名称
 	 */
-	@Column(name = "br_name_en")
+	@Column(name = "br_name_en", unique = true)
 	private String nameEn;
 
 	/**

src/main/java/com/uas/platform/b2c/prod/product/brand/modal/BrandSubmit.java

@@ -25,8 +25,7 @@ public class BrandSubmit implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "product$brand_submit_gen")
-	@SequenceGenerator(name = "product$brand_submit_gen", sequenceName = "product$brand_submit_seq", allocationSize = 1)
+	@GeneratedValue
 	private Long id;
 
 	/**

src/main/java/com/uas/platform/b2c/prod/product/brand/modal/BrandVersion.java

@@ -21,8 +21,7 @@ public class BrandVersion implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "product$brand_version_gen")
-	@SequenceGenerator(name = "product$brand_version_gen", sequenceName = "product$brand_version_seq", allocationSize = 1)
+	@GeneratedValue
 	private Long id;
 
 	/**

src/main/java/com/uas/platform/b2c/prod/product/common/model/CommonCount.java

@@ -21,8 +21,7 @@ public class CommonCount implements Serializable{
      */
     @Id
     @Column(name = "cc_id")
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "product$commoncount_gen")
-    @SequenceGenerator(name = "product$commoncount_gen", sequenceName = "product$commoncount_seq", allocationSize = 1)
+    @GeneratedValue
     private Long id;
 
     /**

src/main/java/com/uas/platform/b2c/prod/product/common/model/CreateNumber.java

@@ -3,9 +3,7 @@ package com.uas.platform.b2c.prod.product.common.model;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 
 /**
@@ -18,8 +16,7 @@ import javax.persistence.Table;
 public class CreateNumber {
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "product$goods_gen")
-	@SequenceGenerator(name = "product$goods_gen", sequenceName = "product$goods_seq", allocationSize = 1)
+	@GeneratedValue
 	@Column(name = "cn_id")
 	private Long id;
 

src/main/java/com/uas/platform/b2c/prod/product/common/model/ReviewerEmailInfo.java

@@ -23,8 +23,7 @@ public class ReviewerEmailInfo implements Serializable {
      */
     @Id
     @Column(name = "id")
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "sys$evieweremailinfo_gen")
-    @SequenceGenerator(name = "sys$evieweremailinfo_gen", sequenceName = "sys$evieweremailinfo_seq", allocationSize = 1)
+    @GeneratedValue
     private Long id;
 
     /**

src/main/java/com/uas/platform/b2c/prod/product/component/modal/Component.java

@@ -19,7 +19,7 @@ import java.util.Set;
  * @version  2016年3月11日上午10:24:29 suntg 创建
  */
 @Entity
-@Table(name = "product$component")
+@Table(name = "product$component", indexes = { @Index(name = "BRID_CODE_UNIQUE", columnList = "cmp_code,cmp_brid", unique = true), @Index(name = "PRODUCT$COMPONENT_CODE", columnList = "cmp_code")})
 public class Component implements Serializable {
 
 	/**
@@ -32,8 +32,7 @@ public class Component implements Serializable {
 	 */
 	@Id
 	@Column(name = "cmp_id")
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "product$component_gen")
-	@SequenceGenerator(name = "product$component_gen", sequenceName = "product$component_seq", allocationSize = 1)
+	@GeneratedValue
 	private Long id;
 
 	/**

src/main/java/com/uas/platform/b2c/prod/product/component/modal/ComponentCrawl.java

@@ -13,15 +13,14 @@ import java.util.Set;
  * @version  2016年10月27日上午10:18:16 wangyc 创建
  */
 @Entity
-@Table(name = "product$component_crawl")
+@Table(name = "product$component_crawl", indexes = { @Index(name = "PRODUCT$COMPONENT_CRAWL_TASK", columnList = "cc_task")})
 public class ComponentCrawl implements Serializable {
 
 	private static final long serialVersionUID = 1L;
 
 	@Id
 	@Column(name = "cc_id")
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "product$component_crawl_gen")
-	@SequenceGenerator(name = "product$component_crawl_gen", sequenceName = "product$component_crawl_seq", allocationSize = 1)
+	@GeneratedValue
 	private Long id;
 
 	/**

src/main/java/com/uas/platform/b2c/prod/product/component/modal/ComponentCrawlSubDetail.java

@@ -21,8 +21,7 @@ public class ComponentCrawlSubDetail implements Serializable {
 
 	@Id
 	@Column(name = "ccd_id")
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "product$cmp_crawl_subdt_gen")
-	@SequenceGenerator(name = "product$cmp_crawl_subdt_gen", sequenceName = "product$cmp_crawl_subdt_seq", allocationSize = 1)
+	@GeneratedValue
 	private Long id;
 
 	/**

src/main/java/com/uas/platform/b2c/prod/product/component/modal/ComponentCrawlSubmit.java

@@ -7,13 +7,11 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.OneToMany;
 import javax.persistence.OneToOne;
 import javax.persistence.OrderBy;
-import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 import java.io.Serializable;
 import java.util.Date;
@@ -31,8 +29,7 @@ public class ComponentCrawlSubmit implements Serializable {
 
 	@Id
 	@Column(name = "ccs_id")
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "product$cmp_crawl_submit_gen")
-	@SequenceGenerator(name = "product$cmp_crawl_submit_gen", sequenceName = "product$cmp_crawl_submit_seq", allocationSize = 1)
+	@GeneratedValue
 	private Long id;
 
 	/**

src/main/java/com/uas/platform/b2c/prod/product/component/modal/ComponentCrawlTask.java

@@ -21,8 +21,7 @@ public class ComponentCrawlTask implements Serializable {
 
 	@Id
 	@Column(name = "cct_id")
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "product$cmp_crawl_task_gen")
-	@SequenceGenerator(name = "product$cmp_crawl_task_gen", sequenceName = "product$cmp_crawl_task_seq", allocationSize = 1)
+	@GeneratedValue
 	private Long id;
 
 	/**
@@ -122,7 +121,7 @@ public class ComponentCrawlTask implements Serializable {
 	 * 属性对应关系
 	 */
 	@Lob
-	@Column(name = "cct_contrastjson", columnDefinition = "CLOB")
+	@Column(name = "cct_contrastjson", columnDefinition = "LONGBLOB")
 	private String contrast;
 
 	/**

src/main/java/com/uas/platform/b2c/prod/product/component/modal/ComponentGoods.java

@@ -32,7 +32,7 @@ public class ComponentGoods implements Serializable {
 	 */
 	@Id
 	@Column(name = "id", unique = true, nullable = false, insertable = false, updatable = false)
-	private String id;
+	private Long id;
 
 	/**
 	 * product$component的主键
@@ -295,11 +295,11 @@ public class ComponentGoods implements Serializable {
 	@Column(name = "go_storename")
 	private String storeName;
 
-	public String getId() {
+	public Long getId() {
 		return id;
 	}
 
-	public void setId(String id) {
+	public void setId(Long id) {
 		this.id = id;
 	}
 

src/main/java/com/uas/platform/b2c/prod/product/component/modal/ComponentSubmit.java

@@ -13,13 +13,11 @@ import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.OneToMany;
 import javax.persistence.OneToOne;
 import javax.persistence.OrderBy;
-import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 import java.io.Serializable;
 import java.util.Date;
@@ -41,8 +39,7 @@ public class ComponentSubmit implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "product$component_submit_gen")
-	@SequenceGenerator(name = "product$component_submit_gen", sequenceName = "product$component_submit_seq", allocationSize = 1)
+	@GeneratedValue
 	@Column(name = "id")
 	private Long id;
 

src/main/java/com/uas/platform/b2c/prod/product/component/modal/ComponentVersion.java

@@ -6,10 +6,8 @@ import com.uas.platform.core.persistence.Logger;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Lob;
-import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 import java.io.Serializable;
 import java.util.Date;
@@ -34,15 +32,14 @@ public class ComponentVersion implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "product$component_version_gen")
-	@SequenceGenerator(name = "product$component_version_gen", sequenceName = "product$component_version_seq", allocationSize = 1)
+	@GeneratedValue
 	@Column(name = "id")
 	private Long id;
 
 	/**
 	 * 标准器件唯一标识符UUID
 	 */
-	@Column(name = "cmp_uuid", unique = true)
+	@Column(name = "cmp_uuid")
 	private String uuid;
 
 	/**
@@ -73,7 +70,7 @@ public class ComponentVersion implements Serializable {
 	 * 创建人对应的Json字符串
 	 */
 	@Lob
-	@Column(name = "cmp_defineuserJson")
+	@Column(name = "cmp_defineuserJson", length = 2000)
 	private String defineuserJson;
 
 	/**
@@ -86,7 +83,7 @@ public class ComponentVersion implements Serializable {
 	 * 最近更新人对应的Json字符串
 	 */
 	@Lob
-	@Column(name = "cmp_modifyuserJson")
+	@Column(name = "cmp_modifyuserJson", length = 2000)
 	private String modifyuserJson;
 
 	/**
@@ -124,7 +121,7 @@ public class ComponentVersion implements Serializable {
 	 * 详细描述
 	 */
 	@Lob
-	@Column(name = "cmp_description")
+	@Column(name = "cmp_description", columnDefinition = "TEXT")
 	private String description;
 
 	/**
@@ -151,7 +148,7 @@ public class ComponentVersion implements Serializable {
 	 * 为了前端解析展示的便利，将$scope.properties转换成字符串保存下来，这样直接在前端解析后便可以使用统一的数据格式&样式等
 	 */
 	@Lob
-	@Column(name = "properties_json")
+	@Column(name = "properties_json", columnDefinition = "LONGBLOB")
 	private String propertiesJson;
 
 	public Long getId() {

src/main/java/com/uas/platform/b2c/prod/product/kind/dao/KindDao.java

@@ -29,7 +29,7 @@ public interface KindDao extends JpaSpecificationExecutor<Kind>, JpaRepository<K
 	 * @param parentid
 	 * @return
 	 */
-	@Query("select nvl(max(k.detno), 0) from Kind k where k.parentid = :parentid")
+	@Query("select coalesce(max(k.detno), 0) from Kind k where k.parentid = :parentid")
 	public short findLastNumberByParentid(@Param("parentid") Long parentid);
 
 	/**

src/main/java/com/uas/platform/b2c/prod/product/kind/model/AdviceAction.java

@@ -25,8 +25,7 @@ public class AdviceAction implements Serializable {
 	
 	@Id
 	@Column(name = "paa_id")
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "product$adviceaction_gen")
-	@SequenceGenerator(name = "product$adviceaction_gen", sequenceName = "product$adviceaction_seq", allocationSize = 1)
+	@GeneratedValue
 	private Long id;
 	
 	/**

src/main/java/com/uas/platform/b2c/prod/product/kind/model/Kind.java

@@ -34,8 +34,7 @@ public class Kind implements Serializable {
 	 */
 	@Id
 	@Column(name = "ki_id")
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "product$kind_gen")
-	@SequenceGenerator(name = "product$kind_gen", sequenceName = "product$kind_seq", allocationSize = 1)
+	@GeneratedValue
 	private Long id;
 
 	/**

src/main/java/com/uas/platform/b2c/prod/product/kind/model/KindAdvice.java

@@ -8,11 +8,9 @@ import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.OneToOne;
-import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 import java.io.Serializable;
 import java.util.Date;
@@ -33,8 +31,7 @@ public class KindAdvice implements Serializable {
 
 	@Id
 	@Column(name = "pka_id")
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "product$kindadvice_gen")
-	@SequenceGenerator(name = "product$kindadvice_gen", sequenceName = "product$kindadvice_seq", allocationSize = 1)
+	@GeneratedValue
 	private Long id;
 
 	/**

src/main/java/com/uas/platform/b2c/prod/product/kind/model/KindCrawl.java

@@ -23,8 +23,7 @@ public class KindCrawl implements Serializable {
 
 	@Id
 	@Column(name = "kc_id")
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "product$kind_crawl_gen")
-	@SequenceGenerator(name = "product$kind_crawl_gen", sequenceName = "product$kind_crawl_seq", allocationSize = 1)
+	@GeneratedValue
 	private Long id;
 
 	/**

src/main/java/com/uas/platform/b2c/prod/product/kind/model/KindProperty.java

@@ -28,8 +28,7 @@ public class KindProperty implements Serializable {
 	 */
 	@Id
 	@Column(name = "kp_id")
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "product$kindproperty_gen")
-	@SequenceGenerator(name = "product$kindproperty_gen", sequenceName = "product$kindproperty_seq", allocationSize = 1)
+	@GeneratedValue
 	private Long id;
 
 	/**

src/main/java/com/uas/platform/b2c/prod/product/kind/model/KindPropertyOption.java

@@ -20,8 +20,7 @@ public class KindPropertyOption implements Serializable {
 
 	@Id
 	@Column(name = "kpo_id")
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "product$kindpropertyoption_gen")
-	@SequenceGenerator(name = "product$kindpropertyoption_gen", sequenceName = "product$kindpropertyoption_seq", allocationSize = 1)
+	@GeneratedValue
 	private Long id;
 
 	/**

src/main/java/com/uas/platform/b2c/prod/product/kind/model/KindPropertyUnit.java

@@ -20,8 +20,7 @@ public class KindPropertyUnit implements Serializable {
 
 	@Id
 	@Column(name = "kpu_id")
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "product$kindpropertyunit_gen")
-	@SequenceGenerator(name = "product$kindpropertyunit_gen", sequenceName = "product$kindpropertyunit_seq", allocationSize = 1)
+	@GeneratedValue
 	private Long id;
 
 	/**

src/main/java/com/uas/platform/b2c/prod/product/kind/model/KindPropertyValues.java

@@ -26,8 +26,7 @@ public class KindPropertyValues implements Serializable {
 	 */
 	@Id
 	@Column(name = "kpv_id")
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "product$kindpropertyvalue_gen")
-	@SequenceGenerator(name = "product$kindpropertyvalue_gen", sequenceName = "product$kindpropertyvalue_seq", allocationSize = 1)
+	@GeneratedValue
 	private Long id;
 
 	/**

src/main/java/com/uas/platform/b2c/prod/product/property/model/Property.java

@@ -23,8 +23,7 @@ public class Property implements Serializable {
 	 */
 	@Id
 	@Column(name = "pt_id")
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "product$property_gen")
-	@SequenceGenerator(name = "product$property_gen", sequenceName = "product$property_seq", allocationSize = 1)
+	@GeneratedValue
 	private Long id;
 
 	/**

src/main/java/com/uas/platform/b2c/prod/product/property/model/PropertyCrawl.java

@@ -16,8 +16,7 @@ public class PropertyCrawl implements Serializable {
 
 	@Id
 	@Column(name = "pc_id")
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "product$property_crawl_gen")
-	@SequenceGenerator(name = "product$property_crawl_gen", sequenceName = "product$property_crawl_seq", allocationSize = 1)
+	@GeneratedValue
 	private Long id;
 
 	/**

src/main/java/com/uas/platform/b2c/prod/product/property/model/PropertyValue.java

@@ -1,16 +1,6 @@
 package com.uas.platform.b2c.prod.product.property.model;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
-import javax.persistence.OrderBy;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
+import javax.persistence.*;
 
 /**
  * 器件对应的属性的值
@@ -19,7 +9,7 @@ import javax.persistence.Table;
  * @version  2016年3月11日下午2:24:29 suntg 创建
  */
 @Entity
-@Table(name = "product$propertyvalue")
+@Table(name = "product$propertyvalue", indexes = { @Index(name = "PROPERTYVALUE_P_CMP_INDEX", columnList = "pv_componentid,pv_propertyid"), @Index(name = "PROPERTYVALUE_CMPID_INDEX", columnList = "pv_componentid"), @Index(name = "PROPERTYVALUE_VALUE_INDEX", columnList = "pv_value")})
 public class PropertyValue {
 
 	/**
@@ -27,8 +17,7 @@ public class PropertyValue {
 	 */
 	@Id
 	@Column(name = "pv_id")
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "product$propertyvalue_gen")
-	@SequenceGenerator(name = "product$propertyvalue_gen", sequenceName = "product$propertyvalue_seq", allocationSize = 1)
+	@GeneratedValue
 	private Long id;
 
 	@Column(name = "pv_componentid")
@@ -57,7 +46,7 @@ public class PropertyValue {
 	/**
 	 * 属性的值
 	 */
-	@Column(name = "pv_value")
+	@Column(name = "pv_value", length = 2000)
 	private String value;
 
 	/**

src/main/java/com/uas/platform/b2c/prod/product/property/model/PropertyValueCrawl.java

@@ -16,8 +16,7 @@ public class PropertyValueCrawl implements Serializable {
 
 	@Id
 	@Column(name = "pvc_id")
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "product$pv_crawl_gen")
-	@SequenceGenerator(name = "product$pv_crawl_gen", sequenceName = "product$pv_crawl_seq", allocationSize = 1)
+	@GeneratedValue
 	private Long id;
 
 	/**

src/main/java/com/uas/platform/b2c/prod/product/property/model/PropertyValueSubmit.java

@@ -24,8 +24,7 @@ public class PropertyValueSubmit implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "product$properties_submit_gen")
-	@SequenceGenerator(name = "product$properties_submit_gen", sequenceName = "product$properties_submit_seq", allocationSize = 1)
+	@GeneratedValue
 	private Long id;
 
 	/**
@@ -65,7 +64,7 @@ public class PropertyValueSubmit implements Serializable {
 	/**
 	 * 属性值
 	 */
-	@Column(name = "ps_value")
+	@Column(name = "ps_value", length = 500)
 	private String stringValue;
 
 	/**

src/main/java/com/uas/platform/b2c/prod/store/dao/StoreInDao.java

@@ -69,7 +69,7 @@ public interface StoreInDao extends JpaSpecificationExecutor<StoreIn>, JpaReposi
 	 *
 	 * @return List<StoreIn>
 	 */
-	@Query(nativeQuery = true, value = "select nvl(s,0) m, i.* from (select sum(nvl(go_reserve,0)) s, go_storeid" +
+	@Query(nativeQuery = true, value = "select coalesce(s,0) m, i.* from (select sum(coalesce(go_reserve,0)) s, go_storeid" +
 			" from trade$goods g group by go_storeid ) a right join store$info i " +
 			" on a.go_storeid=i.ST_UUID where i.ST_TYPE ='AGENCY' or i.ST_TYPE ='DISTRIBUTION' order by m DESC")
 	List<StoreIn> findAGENCYStoreIn();
@@ -79,7 +79,7 @@ public interface StoreInDao extends JpaSpecificationExecutor<StoreIn>, JpaReposi
 	 *
 	 * @return List<StoreIn>
 	 */
-	@Query(nativeQuery = true, value = "select nvl(s,0) m, i.* from (select sum(nvl(go_reserve,0)) s, go_storeid" +
+	@Query(nativeQuery = true, value = "select coalesce(s,0) m, i.* from (select sum(coalesce(go_reserve,0)) s, go_storeid" +
 			" from trade$goods g group by go_storeid ) a right join store$info i " +
 			" on a.go_storeid=i.ST_UUID where i.ST_TYPE ='ORIGINAL_FACTORY' order by m DESC")
 	List<StoreIn> findOriginalStoreIn();

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

@@ -6,9 +6,7 @@ import com.uas.platform.b2c.core.utils.JacksonUtils;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 import java.util.Date;
 
@@ -25,8 +23,7 @@ import java.util.Date;
 public class ConsignmentAgreeRecord {
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "store$consignment_agree_gen")
-	@SequenceGenerator(name = "store$consignment_agree_gen", sequenceName = "store$consignment_agree_seq", allocationSize = 1)
+	@GeneratedValue
 	private Long id;
 
 	/**

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

@@ -2,15 +2,7 @@ package com.uas.platform.b2c.prod.store.model;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
+import javax.persistence.*;
 import java.util.Date;
 
 /**
@@ -27,8 +19,7 @@ public class Qualification {
 	// TODO huxz 资质证明字段需要调整，待正式发布后做调整
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "store$qualification_gen")
-	@SequenceGenerator(name = "store$qualification_gen", sequenceName = "store$qualification_seq", allocationSize = 1)
+	@GeneratedValue
 	@Column(name = "id")
 	private Long id;
 

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

@@ -6,16 +6,7 @@ import com.uas.platform.b2c.core.utils.JacksonUtils;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import javax.persistence.*;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
@@ -32,8 +23,7 @@ import java.util.List;
 public class StoreApply {
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "store$apply_gen")
-	@SequenceGenerator(name = "store$apply_gen", sequenceName = "store$apply_seq", allocationSize = 1)
+	@GeneratedValue
 	@Column(name = "id")
 	private Long id;
 
@@ -145,7 +135,7 @@ public class StoreApply {
 	 * 公司信息JSON字符串
 	 */
 	@JsonIgnore
-	@Column(name = "apply_store_enterprise", length = 2000)
+	@Column(name = "apply_store_enterprise", length = 2000,columnDefinition="TEXT")
 	private String enterpriseJson;
 
 	/**
@@ -157,7 +147,7 @@ public class StoreApply {
 	@Column(name = "apply_en_type")
 	private String enType;
 
-	@Column(name = "apply_en_qualification", length = 4000)
+	@Column(name = "apply_en_qualification", length = 4000,columnDefinition="TEXT")
 	private String enQualification;
 
 	//----------------------------------------------------- 资质信息
@@ -166,7 +156,7 @@ public class StoreApply {
 	 * 资质信息JSON
 	 */
 	@JsonIgnore
-	@Column(name = "apply_qualifications", length = 4000)
+	@Column(name = "apply_qualifications", length = 4000,columnDefinition="TEXT")
 	private String qualificationsJson;
 
 	/**

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

@@ -6,9 +6,7 @@ import com.uas.platform.b2c.core.utils.JacksonUtils;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 
 /**
@@ -23,8 +21,7 @@ import javax.persistence.Table;
 public class StoreBrandInfo {
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "store$brand_info_gen")
-	@SequenceGenerator(name = "store$brand_info_gen", sequenceName = "store$brand_info_seq", allocationSize = 1)
+	@GeneratedValue
 	@Column(name = "id")
 	private Long id;
 

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

@@ -6,21 +6,7 @@ import com.uas.platform.b2c.core.utils.JacksonUtils;
 import com.uas.platform.b2c.prod.commodity.model.Goods;
 import org.springframework.util.StringUtils;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderBy;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.HashSet;
@@ -41,8 +27,7 @@ public class StoreIn implements Serializable {
 	private static final long serialVersionUID = -2806666044917530730L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "store$info_gen")
-	@SequenceGenerator(name = "store$info_gen", sequenceName = "store$info_seq", allocationSize = 1)
+	@GeneratedValue
 	@Column(name = "id")
 	private Long id;
 
@@ -138,7 +123,7 @@ public class StoreIn implements Serializable {
 	 * 企业信息JSON
 	 */
 	@JsonIgnore
-	@Column(name = "st_en_json", length = 2000)
+	@Column(name = "st_en_json", length = 2000 ,columnDefinition="TEXT")
 	private String enterpriseJson;
 
 	/**
@@ -156,7 +141,7 @@ public class StoreIn implements Serializable {
 	/**
 	 * 企业资质信息
 	 */
-	@Column(name = "st_en_qualification", length = 4000)
+	@Column(name = "st_en_qualification" ,columnDefinition="TEXT")
 	private String enQualification;
 
 	/**
@@ -172,9 +157,8 @@ public class StoreIn implements Serializable {
 	/**
 	 * 资质证明信息集合
 	 */
-	@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER, targetEntity = Qualification.class, orphanRemoval = true)
-	@OrderBy
-	@JoinColumn(name = "qu_store_id")
+	@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER, targetEntity = Qualification.class)
+	@JoinColumn(name = "qu_store_id", referencedColumnName = "st_uuid")
 	private Set<Qualification> qualifications = new HashSet<>();
 
 	/**

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

@@ -6,19 +6,7 @@ import com.uas.platform.b2c.core.utils.JacksonUtils;
 import com.uas.platform.b2c.prod.store.utils.StoreBusinessUtils;
 import org.springframework.util.StringUtils;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import javax.persistence.*;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
@@ -39,8 +27,7 @@ public class StoreViolations {
 	 * ID
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "store$violations_gen")
-	@SequenceGenerator(name = "store$violations_gen", sequenceName = "store$violations_seq", allocationSize = 1)
+	@GeneratedValue
 	@Column(name = "id")
 	private Long id;
 
@@ -102,7 +89,7 @@ public class StoreViolations {
 	 * 违规处置证据信息
 	 */
 	@JsonIgnore
-	@Column(name = "vi_dis_proof_json", length = 2000)
+	@Column(name = "vi_dis_proof_json", length = 2000,columnDefinition="TEXT")
 	private String disposeProofJson;
 
 	/**
@@ -138,7 +125,7 @@ public class StoreViolations {
 	 * 卖家申述具体说明证据信息
 	 */
 	@JsonIgnore
-	@Column(name = "vi_comp_proof_json", length = 2000)
+	@Column(name = "vi_comp_proof_json", length = 2000,columnDefinition="TEXT")
 	private String complaintProofJson;
 
 	/**

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

@@ -6,9 +6,7 @@ import com.uas.platform.b2c.core.utils.JacksonUtils;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 import java.util.Date;
 
@@ -27,8 +25,7 @@ public class ViolationsOperator {
 	 * ID
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "store$operator_gen")
-	@SequenceGenerator(name = "store$operator_gen", sequenceName = "store$operator_seq", allocationSize = 1)
+	@GeneratedValue
 	@Column(name = "id")
 	private Long id;
 

src/main/java/com/uas/platform/b2c/trade/aftersale/model/ChangeFB2c.java

@@ -11,13 +11,11 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.OneToMany;
 import javax.persistence.OneToOne;
 import javax.persistence.OrderBy;
-import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 import java.io.Serializable;
 import java.util.Date;
@@ -39,8 +37,7 @@ public class ChangeFB2c extends Document implements Serializable {
 	 * ID
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "trade$change_fmb2c_gen")
-	@SequenceGenerator(name = "trade$change_fmb2c_gen", sequenceName = "trade$change_fmb2c_seq", allocationSize = 1)
+	@GeneratedValue
 	@Column(name = "id")
 	private Long id;