fix:POS及营帐通开通流程修改
This commit is contained in:
@@ -48,6 +48,12 @@ public interface PreparationService {
|
|||||||
* @param shopId
|
* @param shopId
|
||||||
*/
|
*/
|
||||||
void sysStoreCompleted(Long shopId);
|
void sysStoreCompleted(Long shopId);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 营业执照和建店资料收集阶段完成后推进POS和营帐通开通
|
||||||
|
* @param shopId 店铺id
|
||||||
|
*/
|
||||||
|
void businessLicenseAndBuildStoreCompleted(Long shopId);
|
||||||
/**
|
/**
|
||||||
* 证照办理+建店资料 都完成 初始化平台建店数据
|
* 证照办理+建店资料 都完成 初始化平台建店数据
|
||||||
* @param shopId
|
* @param shopId
|
||||||
|
|||||||
@@ -138,6 +138,7 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService {
|
|||||||
ShopStageInfoDO shopSubStageInfo = shopStageInfoDAO.getShopSubStageInfo(request.getShopId(), ShopSubStageEnum.SHOP_STAGE_3);
|
ShopStageInfoDO shopSubStageInfo = shopStageInfoDAO.getShopSubStageInfo(request.getShopId(), ShopSubStageEnum.SHOP_STAGE_3);
|
||||||
if (Constants.ONE_INTEGER.equals(request.getSubmitStatus()) && shopSubStageInfo.getShopSubStageStatus().equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_30.getShopSubStageStatus())) {
|
if (Constants.ONE_INTEGER.equals(request.getSubmitStatus()) && shopSubStageInfo.getShopSubStageStatus().equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_30.getShopSubStageStatus())) {
|
||||||
shopStageInfoDAO.updateShopStageAndAuditInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_33, null);
|
shopStageInfoDAO.updateShopStageAndAuditInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_33, null);
|
||||||
|
preparationService.businessLicenseAndBuildStoreCompleted(request.getShopId());
|
||||||
preparationService.licenseCompleted(request.getShopId());
|
preparationService.licenseCompleted(request.getShopId());
|
||||||
preparationService.updateShopStatus(request.getShopId());
|
preparationService.updateShopStatus(request.getShopId());
|
||||||
preparationService.buildStoreAndDecorationComplete(request.getShopId());
|
preparationService.buildStoreAndDecorationComplete(request.getShopId());
|
||||||
|
|||||||
@@ -293,6 +293,7 @@ public class OrderSysInfoServiceImpl implements OrderSysInfoService {
|
|||||||
//初始化数据
|
//初始化数据
|
||||||
preparationService.licenseCompleted(shopId);
|
preparationService.licenseCompleted(shopId);
|
||||||
preparationService.sysStoreCompleted(shopId);
|
preparationService.sysStoreCompleted(shopId);
|
||||||
|
preparationService.businessLicenseAndBuildStoreCompleted(shopId);
|
||||||
preparationService.buildStoreAndDecorationComplete(shopId);
|
preparationService.buildStoreAndDecorationComplete(shopId);
|
||||||
preparationService.selectSiteAndBuildStoreComplete(shopId);
|
preparationService.selectSiteAndBuildStoreComplete(shopId);
|
||||||
preparationService.buildStoreComplete(shopId);
|
preparationService.buildStoreComplete(shopId);
|
||||||
|
|||||||
@@ -220,9 +220,25 @@ public class PreparationServiceImpl implements PreparationService {
|
|||||||
equals(shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_15.getShopSubStage()).getShopSubStageStatus());
|
equals(shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_15.getShopSubStage()).getShopSubStageStatus());
|
||||||
if (flag3) {
|
if (flag3) {
|
||||||
List<ShopSubStageStatusEnum> list = new ArrayList<>();
|
List<ShopSubStageStatusEnum> list = new ArrayList<>();
|
||||||
list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_160);
|
|
||||||
list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_170);
|
list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_170);
|
||||||
list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_230);
|
list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_230);
|
||||||
|
shopStageInfoDAO.batchUpdateShopStageStatus(shopId, list);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void businessLicenseAndBuildStoreCompleted(Long shopId) {
|
||||||
|
List<ShopStageInfoDO> shopStageInfo = shopStageInfoDAO.getShopStageInfo(shopId, null);
|
||||||
|
if (CollectionUtils.isNotEmpty(shopStageInfo)) {
|
||||||
|
Map<Integer, ShopStageInfoDO> shopStageInfoDOMap = shopStageInfo.stream().collect(Collectors.toMap(ShopStageInfoDO::getShopSubStage, data -> data));
|
||||||
|
boolean flag1 = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_156.getShopSubStageStatus().
|
||||||
|
equals(shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_15.getShopSubStage()).getShopSubStageStatus());
|
||||||
|
boolean flag2 = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_33.getShopSubStageStatus().
|
||||||
|
equals(shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_3.getShopSubStage()).getShopSubStageStatus());
|
||||||
|
if (flag1 && flag2) {
|
||||||
|
List<ShopSubStageStatusEnum> list = new ArrayList<>();
|
||||||
|
list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_160);
|
||||||
list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_240);
|
list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_240);
|
||||||
shopStageInfoDAO.batchUpdateShopStageStatus(shopId, list);
|
shopStageInfoDAO.batchUpdateShopStageStatus(shopId, list);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user