Merge remote-tracking branch 'origin/feature_release-tomysql' into feature_release-tomysql

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

@@ -23,6 +23,7 @@ public class OperationInfo implements Serializable {
      * id
      */
     @Id
+    @GeneratedValue
     @Column(name = "id")
     private Long id;
 

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

@@ -266,7 +266,7 @@ public interface GoodsDao extends JpaSpecificationExecutor<Goods>, JpaRepository
      * @param qty the qty 数量
      * @return list
      */
-    @Query(value = "select * from (select u from (select cmp_code, max(cmp_img) i, max(go_createddate) d,max(cmp_uuid) u from trade$goods group by cmp_code) order by i, d desc) where rownum<=:qty", nativeQuery = true)
+    @Query(value = "select u from (select cmp_code, max(cmp_img) as i, max(go_createddate) as d, max(cmp_uuid) as u from trade$goods group by cmp_code) k order by i, d desc limit :qty", nativeQuery = true)
 	List<String> findAvailableOriginalWithImg(@Param("qty") Integer qty);
 
     /**
@@ -455,7 +455,7 @@ public interface GoodsDao extends JpaSpecificationExecutor<Goods>, JpaRepository
      * @param length the length 需要获取的批次的长度
      * @return list
      */
-    @Query(value = "select m from Goods m where m.batchCode in (select max(g.batchCode) from Goods g where g.img is not null group by g.code) and rownum <:length")
+    @Query(value = "select * from trade$goods m where m.go_batchCode in (select max(g.go_batchCode) from trade$goods g where g.cmp_img is not null group by g.cmp_code) limit :length", nativeQuery = true)
 	List<Goods> findLatestGoods(@Param("length") Long length);
 
 

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

@@ -181,12 +181,6 @@ public class ComponentGoods implements Serializable {
 	@Column(name = "cmp_reserve")
 	private Double cmpReserve;
 
-	/**
-	 * 税率
-	 */
-	@Column(name = "go_tax")
-	private Short tax;
-
 	/**
 	 * 产品生产日期
 	 */
@@ -228,30 +222,6 @@ public class ComponentGoods implements Serializable {
 	 */
 	@Column(name = "go_update_date")
 	private Date updateDate;
-	
-	/**
-	 * 货到香港交期最短
-	 */
-	@Column(name = "go_b2cdeliveryhkmintime")
-	private Short b2cDeliveryHKMinTime;
-
-	/**
-	 * 货到香港交期最长
-	 */
-	@Column(name = "go_b2cdeliveryhkmaxtime")
-	private Short b2cDeliveryHKMaxTime;
-
-	/**
-	 * 货到大陆交期最短
-	 */
-	@Column(name = "go_b2cdeliverydemintime")
-	private Short b2cDeliveryDemMinTime;
-
-	/**
-	 * 货到大陆交期最长
-	 */
-	@Column(name = "go_b2cdeliverydemaxtime")
-	private Short b2cDeliveryDemMaxTime;
 
 	/**
 	 * 商城最长交期
@@ -271,18 +241,6 @@ public class ComponentGoods implements Serializable {
 	@Column(name = "go_shiparea")
 	private String shipArea;
 	
-	/**
-	 * 换算之后的价格
-	 */
-	@Column(name = "go_exchangeprice")
-	private String exchangeQtyPrices;
-	
-	/**
-	 * 换算的币别
-	 */
-	@Column(name = "go_exchangecurrency")
-	private String exchangeCurrency;
-
 	/**
 	 * 店铺id
 	 */
@@ -391,22 +349,6 @@ public class ComponentGoods implements Serializable {
 		this.status = status;
 	}
 
-	public String getExchangeQtyPrices() {
-		return exchangeQtyPrices;
-	}
-
-	public void setExchangeQtyPrices(String exchangeQtyPrices) {
-		this.exchangeQtyPrices = exchangeQtyPrices;
-	}
-
-	public String getExchangeCurrency() {
-		return exchangeCurrency;
-	}
-
-	public void setExchangeCurrency(String exchangeCurrency) {
-		this.exchangeCurrency = exchangeCurrency;
-	}
-
 	public String getBatchCode() {
 		return batchCode;
 	}
@@ -537,14 +479,6 @@ public class ComponentGoods implements Serializable {
 		this.currencyName = currencyName;
 	}
 
-	public Short getTax() {
-		return tax;
-	}
-
-	public void setTax(Short tax) {
-		this.tax = tax;
-	}
-
 	public String getProduceDate() {
 		return produceDate;
 	}
@@ -625,42 +559,6 @@ public class ComponentGoods implements Serializable {
 		this.storeName = storeName;
 	}
 
-	public Short getB2cDeliveryHKMinTime() {
-		return b2cDeliveryHKMinTime;
-	}
-
-	public ComponentGoods setB2cDeliveryHKMinTime(Short b2cDeliveryHKMinTime) {
-		this.b2cDeliveryHKMinTime = b2cDeliveryHKMinTime;
-		return this;
-	}
-
-	public Short getB2cDeliveryHKMaxTime() {
-		return b2cDeliveryHKMaxTime;
-	}
-
-	public ComponentGoods setB2cDeliveryHKMaxTime(Short b2cDeliveryHKMaxTime) {
-		this.b2cDeliveryHKMaxTime = b2cDeliveryHKMaxTime;
-		return this;
-	}
-
-	public Short getB2cDeliveryDemMinTime() {
-		return b2cDeliveryDemMinTime;
-	}
-
-	public ComponentGoods setB2cDeliveryDemMinTime(Short b2cDeliveryDemMinTime) {
-		this.b2cDeliveryDemMinTime = b2cDeliveryDemMinTime;
-		return this;
-	}
-
-	public Short getB2cDeliveryDemMaxTime() {
-		return b2cDeliveryDemMaxTime;
-	}
-
-	public ComponentGoods setB2cDeliveryDemMaxTime(Short b2cDeliveryDemMaxTime) {
-		this.b2cDeliveryDemMaxTime = b2cDeliveryDemMaxTime;
-		return this;
-	}
-
 	public Boolean getBreakUp() {
 		return breakUp;
 	}