| Line 30... |
Line 30... |
| 30 |
import com.spice.profitmandi.common.model.UpdateRetailerRequest;
|
30 |
import com.spice.profitmandi.common.model.UpdateRetailerRequest;
|
| 31 |
import com.spice.profitmandi.common.util.StringUtils;
|
31 |
import com.spice.profitmandi.common.util.StringUtils;
|
| 32 |
import com.spice.profitmandi.common.util.Utils;
|
32 |
import com.spice.profitmandi.common.util.Utils;
|
| 33 |
import com.spice.profitmandi.dao.entity.dtr.DistrictMaster;
|
33 |
import com.spice.profitmandi.dao.entity.dtr.DistrictMaster;
|
| 34 |
import com.spice.profitmandi.dao.entity.dtr.Retailer;
|
34 |
import com.spice.profitmandi.dao.entity.dtr.Retailer;
|
| - |
|
35 |
import com.spice.profitmandi.dao.entity.dtr.RetailerBlockBrands;
|
| 35 |
import com.spice.profitmandi.dao.entity.dtr.RetailerRegisteredAddress;
|
36 |
import com.spice.profitmandi.dao.entity.dtr.RetailerRegisteredAddress;
|
| 36 |
import com.spice.profitmandi.dao.entity.dtr.Role;
|
37 |
import com.spice.profitmandi.dao.entity.dtr.Role;
|
| 37 |
import com.spice.profitmandi.dao.entity.dtr.Shop;
|
38 |
import com.spice.profitmandi.dao.entity.dtr.Shop;
|
| 38 |
import com.spice.profitmandi.dao.entity.dtr.ShopAddress;
|
39 |
import com.spice.profitmandi.dao.entity.dtr.ShopAddress;
|
| 39 |
import com.spice.profitmandi.dao.entity.dtr.User;
|
40 |
import com.spice.profitmandi.dao.entity.dtr.User;
|
| Line 54... |
Line 55... |
| 54 |
import com.spice.profitmandi.dao.enumuration.dtr.RoleType;
|
55 |
import com.spice.profitmandi.dao.enumuration.dtr.RoleType;
|
| 55 |
import com.spice.profitmandi.dao.enumuration.fofo.PaymentOptionType;
|
56 |
import com.spice.profitmandi.dao.enumuration.fofo.PaymentOptionType;
|
| 56 |
import com.spice.profitmandi.dao.repository.dtr.DistrictMasterRepository;
|
57 |
import com.spice.profitmandi.dao.repository.dtr.DistrictMasterRepository;
|
| 57 |
import com.spice.profitmandi.dao.repository.dtr.DocumentRepository;
|
58 |
import com.spice.profitmandi.dao.repository.dtr.DocumentRepository;
|
| 58 |
import com.spice.profitmandi.dao.repository.dtr.FofoStoreRepository;
|
59 |
import com.spice.profitmandi.dao.repository.dtr.FofoStoreRepository;
|
| - |
|
60 |
import com.spice.profitmandi.dao.repository.dtr.Mongo;
|
| - |
|
61 |
import com.spice.profitmandi.dao.repository.dtr.RetailerBlockBrandsRepository;
|
| 59 |
import com.spice.profitmandi.dao.repository.dtr.RetailerRegisteredAddressRepository;
|
62 |
import com.spice.profitmandi.dao.repository.dtr.RetailerRegisteredAddressRepository;
|
| 60 |
import com.spice.profitmandi.dao.repository.dtr.RetailerRepository;
|
63 |
import com.spice.profitmandi.dao.repository.dtr.RetailerRepository;
|
| 61 |
import com.spice.profitmandi.dao.repository.dtr.RoleRepository;
|
64 |
import com.spice.profitmandi.dao.repository.dtr.RoleRepository;
|
| 62 |
import com.spice.profitmandi.dao.repository.dtr.ShopAddressRepository;
|
65 |
import com.spice.profitmandi.dao.repository.dtr.ShopAddressRepository;
|
| 63 |
import com.spice.profitmandi.dao.repository.dtr.ShopRepository;
|
66 |
import com.spice.profitmandi.dao.repository.dtr.ShopRepository;
|
| Line 84... |
Line 87... |
| 84 |
|
87 |
|
| 85 |
@Autowired
|
88 |
@Autowired
|
| 86 |
private RetailerRepository retailerRepository;
|
89 |
private RetailerRepository retailerRepository;
|
| 87 |
|
90 |
|
| 88 |
@Autowired
|
91 |
@Autowired
|
| - |
|
92 |
private RetailerBlockBrandsRepository retailerBlockBrandsRepository;
|
| - |
|
93 |
|
| - |
|
94 |
@Autowired
|
| 89 |
private UserAccountRepository userAccountRepository;
|
95 |
private UserAccountRepository userAccountRepository;
|
| 90 |
|
96 |
|
| 91 |
@Autowired
|
97 |
@Autowired
|
| - |
|
98 |
private Mongo mongoClient;
|
| - |
|
99 |
|
| - |
|
100 |
@Autowired
|
| 92 |
private UserRepository userRepository;
|
101 |
private UserRepository userRepository;
|
| 93 |
|
102 |
|
| 94 |
@Autowired
|
103 |
@Autowired
|
| 95 |
private CartRepository cartRepository;
|
104 |
private CartRepository cartRepository;
|
| 96 |
|
105 |
|
| Line 145... |
Line 154... |
| 145 |
|
154 |
|
| 146 |
@Override
|
155 |
@Override
|
| 147 |
public Map<String, Object> getByEmailIdOrMobileNumber(String emailIdOrMobileNumber)
|
156 |
public Map<String, Object> getByEmailIdOrMobileNumber(String emailIdOrMobileNumber)
|
| 148 |
throws ProfitMandiBusinessException {
|
157 |
throws ProfitMandiBusinessException {
|
| 149 |
User user = null;
|
158 |
User user = null;
|
| - |
|
159 |
int fofoId = Utils.SYSTEM_PARTNER_ID;
|
| - |
|
160 |
|
| 150 |
try {
|
161 |
try {
|
| 151 |
user = userRepository.selectByEmailIdOrMobileNumber(emailIdOrMobileNumber);
|
162 |
user = userRepository.selectByEmailIdOrMobileNumber(emailIdOrMobileNumber);
|
| 152 |
} catch (ProfitMandiBusinessException profitMandiBusinessException) {
|
163 |
} catch (ProfitMandiBusinessException profitMandiBusinessException) {
|
| 153 |
|
164 |
|
| 154 |
}
|
165 |
}
|
| Line 178... |
Line 189... |
| 178 |
int retailerId = userAccountRepository.selectRetailerIdByUserId(user.getId());
|
189 |
int retailerId = userAccountRepository.selectRetailerIdByUserId(user.getId());
|
| 179 |
Retailer retailer = retailerRepository.selectById(retailerId);
|
190 |
Retailer retailer = retailerRepository.selectById(retailerId);
|
| 180 |
|
191 |
|
| 181 |
map.put("retailer", retailer);
|
192 |
map.put("retailer", retailer);
|
| 182 |
|
193 |
|
| - |
|
194 |
List<String> retailerBlockBrands = null;
|
| - |
|
195 |
Set<String> brands = null;
|
| - |
|
196 |
if (retailer.getId() != fofoId) {
|
| - |
|
197 |
brands = mongoClient.getMongoBrands(retailer.getId(), null, 3).stream()
|
| - |
|
198 |
.map(x -> (String) x.get("name")).collect(Collectors.toSet());
|
| - |
|
199 |
retailerBlockBrands = retailerBlockBrandsRepository.selectAllByRetailer(retailer.getId()).stream().map(x -> x.getBlockBrands()).collect(Collectors.toList());
|
| - |
|
200 |
|
| - |
|
201 |
LOGGER.info("loginDetailsFofoId" + retailer.getId());
|
| - |
|
202 |
} else {
|
| - |
|
203 |
LOGGER.info("fofoId" + fofoId);
|
| - |
|
204 |
brands = mongoClient.getMongoBrands(fofoId, null, 3).stream().map(x -> (String) x.get("name"))
|
| - |
|
205 |
.collect(Collectors.toSet());
|
| - |
|
206 |
}
|
| - |
|
207 |
map.put("brands", brands);
|
| - |
|
208 |
map.put("retailerBlockBrands", retailerBlockBrands);
|
| 183 |
if (this.containsRoleType(userRoles, role.getId())) {
|
209 |
if (this.containsRoleType(userRoles, role.getId())) {
|
| 184 |
try {
|
210 |
try {
|
| 185 |
FofoStore fofoStore = fofoStoreRepository.selectByRetailerId(retailerId);
|
211 |
FofoStore fofoStore = fofoStoreRepository.selectByRetailerId(retailerId);
|
| 186 |
map.put("fofoStore", fofoStore);
|
212 |
map.put("fofoStore", fofoStore);
|
| 187 |
// map.put("counterSize", fofoStore.getCounterSize().toString());
|
213 |
// map.put("counterSize", fofoStore.getCounterSize().toString());
|
| Line 273... |
Line 299... |
| 273 |
@Override
|
299 |
@Override
|
| 274 |
public Map<String, Object> updateRetailerDetails(UpdateRetailerRequest updateRetailerRequest)
|
300 |
public Map<String, Object> updateRetailerDetails(UpdateRetailerRequest updateRetailerRequest)
|
| 275 |
throws ProfitMandiBusinessException {
|
301 |
throws ProfitMandiBusinessException {
|
| 276 |
Map<String, Object> map = this.getByEmailIdOrMobileNumber(updateRetailerRequest.getEmailIdOrMobileNumber());
|
302 |
Map<String, Object> map = this.getByEmailIdOrMobileNumber(updateRetailerRequest.getEmailIdOrMobileNumber());
|
| 277 |
User user = (User) map.get("user");
|
303 |
User user = (User) map.get("user");
|
| - |
|
304 |
|
| 278 |
user = this.createUser(user, updateRetailerRequest);
|
305 |
user = this.createUser(user, updateRetailerRequest);
|
| - |
|
306 |
|
| 279 |
map.put("user", user);
|
307 |
map.put("user", user);
|
| 280 |
List<UserRole> userRoles = (List<UserRole>) map.get("userRoles");
|
308 |
List<UserRole> userRoles = (List<UserRole>) map.get("userRoles");
|
| 281 |
Role roleUser = roleRepository.selectByName(RoleType.USER.toString());
|
309 |
Role roleUser = roleRepository.selectByName(RoleType.USER.toString());
|
| 282 |
userRoles = this.addRole(userRoles, user.getId(), roleUser.getId());
|
310 |
userRoles = this.addRole(userRoles, user.getId(), roleUser.getId());
|
| 283 |
Retailer retailer = (Retailer) map.get("retailer");
|
311 |
Retailer retailer = (Retailer) map.get("retailer");
|
| 284 |
retailer = this.updateRetailer(user, retailer, updateRetailerRequest);
|
312 |
retailer = this.updateRetailer(user, retailer, updateRetailerRequest);
|
| - |
|
313 |
|
| 285 |
map.put("retailer", retailer);
|
314 |
map.put("retailer", retailer);
|
| 286 |
|
315 |
|
| - |
|
316 |
List<String> retailerBlockBrands = retailerBlockBrandsRepository.selectAllByRetailer(retailer.getId())
|
| - |
|
317 |
.stream().map(x -> x.getBlockBrands()).collect(Collectors.toList());
|
| - |
|
318 |
|
| - |
|
319 |
LOGGER.info("retailerBlockBrands"+retailerBlockBrands);
|
| - |
|
320 |
|
| - |
|
321 |
if (!retailerBlockBrands.isEmpty()) {
|
| - |
|
322 |
retailerBlockBrandsRepository.deleteBrands(retailer.getId());
|
| - |
|
323 |
}
|
| - |
|
324 |
|
| - |
|
325 |
for (String blockBrand : updateRetailerRequest.getBlocksBrands()) {
|
| - |
|
326 |
RetailerBlockBrands retailerBlockBrand = new RetailerBlockBrands();
|
| - |
|
327 |
|
| - |
|
328 |
retailerBlockBrand.setFofoId(retailer.getId());
|
| - |
|
329 |
retailerBlockBrand.setBlockBrands(blockBrand);
|
| - |
|
330 |
retailerBlockBrandsRepository.persist(retailerBlockBrand);
|
| - |
|
331 |
|
| - |
|
332 |
}
|
| - |
|
333 |
map.put("retailerBlockBrands", retailerBlockBrands);
|
| - |
|
334 |
|
| 287 |
Role roleRetailer = roleRepository.selectByName(RoleType.RETAILER.toString());
|
335 |
Role roleRetailer = roleRepository.selectByName(RoleType.RETAILER.toString());
|
| 288 |
|
336 |
|
| 289 |
userRoles = this.addRole(userRoles, user.getId(), roleRetailer.getId());
|
337 |
userRoles = this.addRole(userRoles, user.getId(), roleRetailer.getId());
|
| 290 |
|
338 |
|
| 291 |
Role roleFofo = roleRepository.selectByName(RoleType.FOFO.toString());
|
339 |
Role roleFofo = roleRepository.selectByName(RoleType.FOFO.toString());
|
| Line 934... |
Line 982... |
| 934 |
customRetailer.setBusinessName(address.getName());
|
982 |
customRetailer.setBusinessName(address.getName());
|
| 935 |
customRetailer.setMobileNumber(address.getPhoneNumber());
|
983 |
customRetailer.setMobileNumber(address.getPhoneNumber());
|
| 936 |
int userId = 0;
|
984 |
int userId = 0;
|
| 937 |
try {
|
985 |
try {
|
| 938 |
userId = userAccountRepository.selectUserIdByRetailerId(user.getId());
|
986 |
userId = userAccountRepository.selectUserIdByRetailerId(user.getId());
|
| 939 |
} catch(ProfitMandiBusinessException e) {
|
987 |
} catch (ProfitMandiBusinessException e) {
|
| 940 |
continue;
|
988 |
continue;
|
| 941 |
}
|
989 |
}
|
| 942 |
try {
|
990 |
try {
|
| 943 |
customRetailer.setCartId(user.getActiveCartId());
|
991 |
customRetailer.setCartId(user.getActiveCartId());
|
| 944 |
PrivateDealUser pdu = privateDealUserRepository.selectById(address.getRetaierId());
|
992 |
PrivateDealUser pdu = privateDealUserRepository.selectById(address.getRetaierId());
|
| Line 1173... |
Line 1221... |
| 1173 |
|
1221 |
|
| 1174 |
StringBuilder sb = new StringBuilder();
|
1222 |
StringBuilder sb = new StringBuilder();
|
| 1175 |
if (partnerCriteria.getFofoIds().size() > 0) {
|
1223 |
if (partnerCriteria.getFofoIds().size() > 0) {
|
| 1176 |
List<Integer> fofoIds = partnerCriteria.getFofoIds();
|
1224 |
List<Integer> fofoIds = partnerCriteria.getFofoIds();
|
| 1177 |
Map<Integer, CustomRetailer> customRetailers = this.getFofoRetailerUserId(fofoIds);
|
1225 |
Map<Integer, CustomRetailer> customRetailers = this.getFofoRetailerUserId(fofoIds);
|
| 1178 |
List<String> businessNames = customRetailers.values().stream().map(x->x.getBusinessName()).collect(Collectors.toList());
|
1226 |
List<String> businessNames = customRetailers.values().stream().map(x -> x.getBusinessName())
|
| - |
|
1227 |
.collect(Collectors.toList());
|
| 1179 |
sb.append(String.join(", ", businessNames));
|
1228 |
sb.append(String.join(", ", businessNames));
|
| 1180 |
|
1229 |
|
| 1181 |
} else {
|
1230 |
} else {
|
| 1182 |
sb.append("All");
|
1231 |
sb.append("All");
|
| 1183 |
if(partnerCriteria.getPartnerTypes().size() > 0) {
|
1232 |
if (partnerCriteria.getPartnerTypes().size() > 0) {
|
| 1184 |
sb.append(" ").append(String.join(", ", partnerCriteria.getPartnerTypes().stream().map(x->x.getValue()).collect(Collectors.toList())));
|
1233 |
sb.append(" ").append(String.join(", ", partnerCriteria.getPartnerTypes().stream()
|
| - |
|
1234 |
.map(x -> x.getValue()).collect(Collectors.toList())));
|
| 1185 |
}
|
1235 |
}
|
| 1186 |
sb.append(" partners ");
|
1236 |
sb.append(" partners ");
|
| 1187 |
if(partnerCriteria.getRegionIds().size() > 0) {
|
1237 |
if (partnerCriteria.getRegionIds().size() > 0) {
|
| 1188 |
sb.append("from ");
|
1238 |
sb.append("from ");
|
| - |
|
1239 |
sb.append(String.join(", ", partnerCriteria.getRegionIds().stream()
|
| 1189 |
sb.append(String.join(", ", partnerCriteria.getRegionIds().stream().map(x-> ProfitMandiConstants.WAREHOUSE_MAP.get(x)).collect(Collectors.toList())));
|
1240 |
.map(x -> ProfitMandiConstants.WAREHOUSE_MAP.get(x)).collect(Collectors.toList())));
|
| 1190 |
}
|
1241 |
}
|
| 1191 |
}
|
1242 |
}
|
| 1192 |
return sb.toString();
|
1243 |
return sb.toString();
|
| 1193 |
}
|
1244 |
}
|
| 1194 |
}
|
1245 |
}
|