|
@@ -84,9 +84,24 @@ public class SellerFuncService { |
|
@@ -84,9 +84,24 @@ public class SellerFuncService { |
84
|
}
|
84
|
}
|
85
|
|
85
|
|
86
|
|
86
|
|
87
|
- private SellerLevelFuncBo getDefaultSLFB(){
|
87
|
+ private SellerLevelFuncBo getDefaultSLFB(Integer estc){
|
88
|
SellerLevelFuncBo defaultSLFB = new SellerLevelFuncBo();
|
88
|
SellerLevelFuncBo defaultSLFB = new SellerLevelFuncBo();
|
89
|
- defaultSLFB.setLevel(SellerConfig.ENTER_TYPE_DEFAULT_LEVEL);
|
89
|
+ Integer level ;
|
|
|
90
|
+ if (estc == null){
|
|
|
91
|
+ level = SellerConfig.ENTER_TYPE_DEFAULT_LEVEL;
|
|
|
92
|
+ }else{
|
|
|
93
|
+ EntrySellerType est = EntrySellerType.getEntrySellerType(estc);
|
|
|
94
|
+ switch(est){
|
|
|
95
|
+ case SUPER_ENTRY:
|
|
|
96
|
+ level = SuperEnterStageLevel.DISABLE.getCode();
|
|
|
97
|
+ break;
|
|
|
98
|
+ default:
|
|
|
99
|
+ level = SellerConfig.ENTER_TYPE_DEFAULT_LEVEL;
|
|
|
100
|
+ break;
|
|
|
101
|
+ }
|
|
|
102
|
+ }
|
|
|
103
|
+
|
|
|
104
|
+ defaultSLFB.setLevel(level);
|
90
|
defaultSLFB.setFuncList(SellerConfig.ENTER_TYPE_DEFAULT_FUNCS);
|
105
|
defaultSLFB.setFuncList(SellerConfig.ENTER_TYPE_DEFAULT_FUNCS);
|
91
|
defaultSLFB.setFuncIdList(new ArrayList<>(1));
|
106
|
defaultSLFB.setFuncIdList(new ArrayList<>(1));
|
92
|
return defaultSLFB;
|
107
|
return defaultSLFB;
|
|
@@ -120,7 +135,7 @@ public class SellerFuncService { |
|
@@ -120,7 +135,7 @@ public class SellerFuncService { |
120
|
logger.info("in getSellerLevelFuncWithWallet SellerLevelFuncBo {} uid {}", slfb, uid);
|
135
|
logger.info("in getSellerLevelFuncWithWallet SellerLevelFuncBo {} uid {}", slfb, uid);
|
121
|
|
136
|
|
122
|
}else{
|
137
|
}else{
|
123
|
- slfb = getDefaultSLFB();
|
138
|
+ slfb = getDefaultSLFB(currentEST.getCode());
|
124
|
logger.warn("in getSellerLevelFuncWithWallet getDefault uid {} SLFB {}", uid, slfb);
|
139
|
logger.warn("in getSellerLevelFuncWithWallet getDefault uid {} SLFB {}", uid, slfb);
|
125
|
}
|
140
|
}
|
126
|
return slfb;
|
141
|
return slfb;
|
|
@@ -158,14 +173,14 @@ public class SellerFuncService { |
|
@@ -158,14 +173,14 @@ public class SellerFuncService { |
158
|
return slfb;
|
173
|
return slfb;
|
159
|
}else{
|
174
|
}else{
|
160
|
logger.warn("in getSellerLevelFuncWithSetting getDefaultSLFB uid {}", uid);
|
175
|
logger.warn("in getSellerLevelFuncWithSetting getDefaultSLFB uid {}", uid);
|
161
|
- return getDefaultSLFB();
|
176
|
+ return getDefaultSLFB(currentEST.getCode());
|
162
|
}
|
177
|
}
|
163
|
}
|
178
|
}
|
164
|
|
179
|
|
165
|
|
180
|
|
166
|
public SellerLevelFuncBo getSellerLevelFunc(Integer enterType,Integer level){
|
181
|
public SellerLevelFuncBo getSellerLevelFunc(Integer enterType,Integer level){
|
167
|
if (level==null || level == SellerConfig.ENTER_TYPE_DEFAULT_LEVEL){
|
182
|
if (level==null || level == SellerConfig.ENTER_TYPE_DEFAULT_LEVEL){
|
168
|
- return getDefaultSLFB();
|
183
|
+ return getDefaultSLFB(enterType);
|
169
|
}
|
184
|
}
|
170
|
Map<Integer, Map<Integer,SellerLevelFuncBo>> map = getETLVLELFMap();
|
185
|
Map<Integer, Map<Integer,SellerLevelFuncBo>> map = getETLVLELFMap();
|
171
|
logger.info("in getSellerLevelFunc enterType {} level {} map {}", enterType, level, map);
|
186
|
logger.info("in getSellerLevelFunc enterType {} level {} map {}", enterType, level, map);
|
|
@@ -176,7 +191,7 @@ public class SellerFuncService { |
|
@@ -176,7 +191,7 @@ public class SellerFuncService { |
176
|
&& Objects.nonNull(slfb = levelFuncBoMap.get(level))){
|
191
|
&& Objects.nonNull(slfb = levelFuncBoMap.get(level))){
|
177
|
return slfb;
|
192
|
return slfb;
|
178
|
}
|
193
|
}
|
179
|
- slfb = getDefaultSLFB();
|
194
|
+ slfb = getDefaultSLFB(enterType);
|
180
|
return slfb;
|
195
|
return slfb;
|
181
|
}
|
196
|
}
|
182
|
|
197
|
|