diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java
index 439afb1ee..37d13e74f 100644
--- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java
@@ -17,6 +17,7 @@ import com.cool.store.mapper.ShopInfoMapper;
import com.cool.store.request.*;
import com.cool.store.response.MiniShopsResponse;
import com.cool.store.response.PlatformBuildListResponse;
+import com.cool.store.utils.UUIDUtils;
import com.cool.store.vo.shop.StageShopCountVO;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
@@ -54,6 +55,7 @@ public class ShopInfoDAO {
if(CollectionUtils.isEmpty(shopInfoList)){
return CommonConstants.ZERO;
}
+ shopInfoList.forEach(v -> v.setStoreId(UUIDUtils.get32UUID()));
return shopInfoMapper.batchAddShop(shopInfoList);
}
@@ -96,6 +98,7 @@ public class ShopInfoDAO {
*/
public Long addShopInfo(ShopInfoDO shopInfo){
shopInfoMapper.insertSelective(shopInfo);
+ shopInfo.setStoreId(UUIDUtils.get32UUID());
return shopInfo.getId();
}
diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml
index 20bb1dbd7..783288301 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml
@@ -38,6 +38,7 @@
+
@@ -46,17 +47,17 @@
shop_code, store_num, shop_manager_user_id, supervisor_user_id,
plan_open_time, cur_progress, shop_type, shop_stage, deleted, create_time, update_time,
join_mode,detail_address,franchise_brand,development_manager,want_shop_area_id,investment_manager,shop_status,create_user_id,update_user_id,store_type
- , province,province_code,city,city_code,district,district_code,manager_region_id,shop_decoration_attributes,hqt_shop_id
+ , province,province_code,city,city_code,district,district_code,manager_region_id,shop_decoration_attributes,hqt_shop_id,store_id
insert into xfsg_shop_info(region_id, line_id, partner_id, shop_name,
store_num,supervisor_user_id,create_time,join_mode,franchise_brand,
- development_manager,want_shop_area_id,investment_manager) values
+ development_manager,want_shop_area_id,investment_manager,store_id) values
(#{shop.regionId}, #{shop.lineId}, #{shop.partnerId}, #{shop.shopName},
#{shop.storeNum},#{shop.supervisorUserId},#{shop.createTime},#{shop.joinMode},#{shop.franchiseBrand},#{shop.developmentManager},
- #{shop.wantShopAreaId},#{shop.investmentManager})
+ #{shop.wantShopAreaId},#{shop.investmentManager},#{shop.storeId})
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/ShopInfoDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/ShopInfoDO.java
index 54b6a0f0f..4c11a5798 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/entity/ShopInfoDO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/ShopInfoDO.java
@@ -158,4 +158,7 @@ public class ShopInfoDO {
//红圈通门店id
@Column(name = "hqt_shop_id")
private String hqtShopId;
+ // 门店id
+ @Column(name = "store_id")
+ private String storeId;
}
\ No newline at end of file
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/StoreMasterDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/request/StoreMasterDTO.java
index 642bc5d6d..7f1e8cc20 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/request/StoreMasterDTO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/request/StoreMasterDTO.java
@@ -16,6 +16,8 @@ import java.util.Date;
public class StoreMasterDTO {
private String enterpriseId;
+ @ApiModelProperty("门店id")
+ private String storeId;
@ApiModelProperty("门店名称(加盟签约)")
private String storeName;
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncMainSysServerImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncMainSysServerImpl.java
index e90791f27..e2a14ef65 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncMainSysServerImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncMainSysServerImpl.java
@@ -103,6 +103,7 @@ public class SyncMainSysServerImpl implements SyncMainSysServer {
return;
}
storeMasterDTO.setEnterpriseId(eid);
+ storeMasterDTO.setStoreId(shopInfo.getStoreId());
storeMasterDTO.setStoreStatus("not_open");
storeMasterDTO.setStoreName(shopInfo.getShopName());
storeMasterDTO.setStoreNum(shopInfo.getShopCode());