Merge remote-tracking branch 'origin/cc_20250106_v2.4' into cc_20250106_v2.4

This commit is contained in:
shuo.wang
2025-01-15 18:17:31 +08:00

View File

@@ -58,11 +58,9 @@ public class ShopStageInfoDAO {
ShopStageEnum shopStageEnum = shopSubStageEnum.getShopStageEnum();
shopStageInfo.setShopStage(shopStageEnum.getShopStage());
shopStageInfo.setShopSubStage(shopSubStageEnum.getShopSubStage());
ShopSubStageStatusEnum initStatus;
ShopSubStageStatusEnum initStatus = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_00;
if (flag) {
initStatus = shopSubStageEnum.getInitStatus();
} else {
initStatus = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_00;
}
shopStageInfo.setShopSubStageStatus(initStatus.getShopSubStageStatus());
shopStageInfo.setRemark(shopSubStageEnum.getShopSubStageName() + CommonConstants.PATH_BAR + shopSubStageEnum.getInitStatus().getShopSubStageStatusName());