| Line 182... |
Line 182... |
| 182 |
Retailer retailer = retailerRepository.selectById(uc.getUserId());
|
182 |
Retailer retailer = retailerRepository.selectById(uc.getUserId());
|
| 183 |
// if retailer is activated 1 then verified retailer
|
183 |
// if retailer is activated 1 then verified retailer
|
| 184 |
// else if migrated is 1 then old retailer
|
184 |
// else if migrated is 1 then old retailer
|
| 185 |
// else retailer is not verifed
|
185 |
// else retailer is not verifed
|
| 186 |
if (retailer.isActive()) {
|
186 |
if (retailer.isActive()) {
|
| - |
|
187 |
if(retailer.isFofo()) {
|
| - |
|
188 |
responseMap.put(ProfitMandiConstants.USER_STATUS, UserStatus.FOFO.getValue());
|
| - |
|
189 |
} else {
|
| 187 |
responseMap.put(ProfitMandiConstants.USER_STATUS, UserStatus.VERIFIED_RETAILER.getValue());
|
190 |
responseMap.put(ProfitMandiConstants.USER_STATUS, UserStatus.VERIFIED_RETAILER.getValue());
|
| - |
|
191 |
}
|
| 188 |
} else if (retailer.isMigrated()) {
|
192 |
} else if (retailer.isMigrated()) {
|
| 189 |
responseMap.put(ProfitMandiConstants.USER_STATUS, UserStatus.RETAILER.getValue());
|
193 |
responseMap.put(ProfitMandiConstants.USER_STATUS, UserStatus.RETAILER.getValue());
|
| 190 |
} else {
|
194 |
} else {
|
| 191 |
responseMap.put(ProfitMandiConstants.USER_STATUS, UserStatus.NOT_VERIFIED_RETAILER.getValue());
|
195 |
responseMap.put(ProfitMandiConstants.USER_STATUS, UserStatus.NOT_VERIFIED_RETAILER.getValue());
|
| 192 |
}
|
196 |
}
|
| Line 317... |
Line 321... |
| 317 |
return responseSender.ok(notifications);
|
321 |
return responseSender.ok(notifications);
|
| 318 |
}
|
322 |
}
|
| 319 |
|
323 |
|
| 320 |
private Notification toNotifiaction(JsonObject jsonObject) {
|
324 |
private Notification toNotifiaction(JsonObject jsonObject) {
|
| 321 |
Notification n = (Notification) (new Gson().fromJson(jsonObject.toString(), Notification.class));
|
325 |
Notification n = (Notification) (new Gson().fromJson(jsonObject.toString(), Notification.class));
|
| 322 |
if(n.getStatus().equals("opened") || n.getStatus().equals("referrer") || n.getStatus().equals("seen") ) {
|
326 |
if (n.getStatus().equals("opened") || n.getStatus().equals("referrer") || n.getStatus().equals("seen")) {
|
| 323 |
n.setSeen(true);
|
327 |
n.setSeen(true);
|
| 324 |
}
|
328 |
}
|
| 325 |
return n;
|
329 |
return n;
|
| 326 |
}
|
330 |
}
|
| 327 |
|
331 |
|