suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
shuo.wang
2025-03-31 16:19:17 +08:00
parent aa98da8017
commit cc34f3b5f6
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageEnum.java
View File

@@ -63,6 +63,16 @@ public enum ShopSubStageEnum {
this.planCompleteDays = planCompleteDays;
}
public static Integer getTotalStageIsLocationAndPreparation() {
int total=0;
for (ShopSubStageEnum shopStageEnum : ShopSubStageEnum.values()) {
if (shopStageEnum.getShopStageEnum().getShopStage().equals(ShopStageEnum.SHOP_STAGE_1.getShopStage())
||shopStageEnum.getShopStageEnum().getShopStage().equals(ShopStageEnum.SHOP_STAGE_2.getShopStage())) {
total++;
}
}
}
public static List<ShopSubStageEnum> getShopStageEnum(Integer shopStage) {
List<ShopSubStageEnum> resultList = new ArrayList<>();
for (ShopSubStageEnum shopStageEnum : ShopSubStageEnum.values()) {

2
coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml
View File

@@ -415,6 +415,6 @@
from
xfsg_shop_stage_info
where
shop_id = #{shopId} and deleted = 0 and is_terminated = 1
shop_id = #{shopId} and deleted = 0 and is_terminated = 1 and shop_stage in (1,2)
</select>
</mapper>

2
coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java
View File

@@ -432,7 +432,7 @@ public class ShopServiceImpl implements ShopService {
throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR);
}
Integer completionCount = shopStageInfoDAO.getCompletionCount(shopId);
if (completionCount.equals(ShopSubStageEnum.values().length)) {
if (completionCount.equals(ShopSubStageEnum.getTotalStageIsLocationAndPreparation())) {
shopInfo.setShopStatus(ShopStatusEnum.DONE.getCode());
} else {
shopInfo.setShopStatus(ShopStatusEnum.ING.getCode());