Merge remote-tracking branch 'origin/master'

cash-common/cash-common-service/src/main/java/com/czg/product/entity/ConsGroup.java

@@ -28,6 +28,10 @@ public class ConsGroup implements Serializable {
      */
     @Id(keyType = KeyType.Auto)
     private Long id;
+    /**
+     * 同步id
+     */
+    private Long syncId;
     /**
      * 店铺id
      */

cash-common/cash-common-service/src/main/java/com/czg/product/entity/ConsInfo.java

@@ -29,6 +29,10 @@ public class ConsInfo implements Serializable {
      */
     @Id(keyType = KeyType.Auto)
     private Long id;
+    /**
+     * 同步id
+     */
+    private Long syncId;
     /**
      * 耗材分组id
      */

cash-common/cash-common-service/src/main/java/com/czg/product/entity/ProdConsRelation.java

@@ -24,22 +24,20 @@ public class ProdConsRelation implements Serializable {
     @Serial
     private static final long serialVersionUID = 1L;
 
-    /**
-     * id
-     */
-    @Id(keyType = KeyType.Auto)
-    private Long id;
     /**
      * 店铺id
      */
+    @Id(keyType = KeyType.None)
     private Long shopId;
     /**
      * 商品id
      */
+    @Id(keyType = KeyType.None)
     private Long productId;
     /**
      * 耗材id
      */
+    @Id(keyType = KeyType.None)
     private Long consInfoId;
     /**
      * 单位消耗值

cash-common/cash-common-service/src/main/java/com/czg/product/entity/ProdGroup.java

@@ -29,6 +29,10 @@ public class ProdGroup implements Serializable {
      */
     @Id(keyType = KeyType.Auto)
     private Long id;
+    /**
+     * 同步id
+     */
+    private Long syncId;
     /**
      * 分组名称
      */

cash-common/cash-common-service/src/main/java/com/czg/product/entity/ProdSku.java

@@ -29,6 +29,10 @@ public class ProdSku implements Serializable {
 	*/
 	@Id(keyType = KeyType.Auto)
 	private Long id;
+	/**
+	 * 同步id
+	 */
+	private Long syncId;
 	/**
 	* 店铺id
 	*/

cash-common/cash-common-service/src/main/java/com/czg/product/entity/Product.java

@@ -30,6 +30,10 @@ public class Product implements Serializable {
 	*/
 	@Id(keyType = KeyType.Auto)
 	private Long id;
+	/**
+	 * 同步id
+	 */
+	private Long syncId;
 	/**
 	* 商品分类
 	*/

cash-common/cash-common-service/src/main/java/com/czg/product/entity/ShopProdCategory.java

@@ -28,6 +28,10 @@ public class ShopProdCategory implements Serializable {
 	*/
 	@Id(keyType = KeyType.Auto)
 	private Long id;
+	/**
+	 * 同步id
+	 */
+	private Long syncId;
 	/**
 	* 分类名称
 	*/

cash-common/cash-common-service/src/main/java/com/czg/product/entity/ShopProdSpec.java

@@ -28,6 +28,10 @@ public class ShopProdSpec implements Serializable {
 	*/
 	@Id(keyType = KeyType.Auto)
 	private Long id;
+	/**
+	 * 同步id
+	 */
+	private Long syncId;
 	/**
 	* 规格名称
 	*/

cash-common/cash-common-service/src/main/java/com/czg/product/entity/ShopProdUnit.java

@@ -28,6 +28,10 @@ public class ShopProdUnit implements Serializable {
      */
     @Id(keyType = KeyType.Auto)
     private Long id;
+    /**
+     * 同步id
+     */
+    private Long syncId;
     /**
      * 单位名称
      */

cash-common/cash-common-service/src/main/java/com/czg/product/service/ShopSyncService.java

@@ -0,0 +1,18 @@
+package com.czg.product.service;
+
+import java.util.Map;
+
+/**
+ * @author ww
+ * @description
+ */
+public interface ShopSyncService {
+
+    /**
+     * 同步数据 将源店铺信息 同步到目标店铺(包括分组 分类 单位 规格 商品 SKU 耗材)
+     * @param sourceShopId 源店铺ID
+     * @param targetShopId 目标店铺ID
+     */
+    void sync(Long sourceShopId, Long targetShopId);
+
+}

cash-common/cash-common-service/src/main/java/com/czg/product/vo/ProductGroupVo.java

@@ -40,7 +40,7 @@ public class ProductGroupVo implements Serializable {
         /**
          * 商品ID
          */
-        private Integer proId;
+        private Long proId;
         /**
          * 商品名称
          */
@@ -48,7 +48,7 @@ public class ProductGroupVo implements Serializable {
         /**
          * skuId
          */
-        private Integer skuId;
+        private Long skuId;
         /**
          * sku名称
          */