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

Merge branch 'master' into cc_20250327_tallyBook

Browse Source 
# Conflicts:
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java
This commit is contained in:
shuo.wang
2025-04-01 18:50:27 +08:00
parent 20f3f36347 46227598c9
commit f6fc1c133a
13 changed files with 108 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -63,6 +63,17 @@ 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++;
}
}
return total;
}
public static List<ShopSubStageEnum> getShopStageEnum(Integer shopStage) {
List<ShopSubStageEnum> resultList = new ArrayList<>();
for (ShopSubStageEnum shopStageEnum : ShopSubStageEnum.values()) {