| Line 66... |
Line 66... |
| 66 |
|
66 |
|
| 67 |
@Autowired
|
67 |
@Autowired
|
| 68 |
private RetailerRepository retailerRepository;
|
68 |
private RetailerRepository retailerRepository;
|
| 69 |
|
69 |
|
| 70 |
@Autowired
|
70 |
@Autowired
|
| 71 |
private PincodePartnerRepository PincodePartnerRepository;
|
71 |
private PincodePartnerRepository pincodePartnerRepository;
|
| 72 |
|
72 |
|
| 73 |
@Autowired
|
73 |
@Autowired
|
| 74 |
private BrandLimitRepository brandLimitRepository;
|
74 |
private BrandLimitRepository brandLimitRepository;
|
| 75 |
|
75 |
|
| 76 |
@Autowired
|
76 |
@Autowired
|
| Line 893... |
Line 893... |
| 893 |
|
893 |
|
| 894 |
RetailerBrandsLimit retailerBrands = retailerBrandsLimitRepository.selectLimitByBrandAndFofoId(fofoId, brand);
|
894 |
RetailerBrandsLimit retailerBrands = retailerBrandsLimitRepository.selectLimitByBrandAndFofoId(fofoId, brand);
|
| 895 |
|
895 |
|
| 896 |
if (retailerBrands == null) {
|
896 |
if (retailerBrands == null) {
|
| 897 |
retailerBrands = new RetailerBrandsLimit();
|
897 |
retailerBrands = new RetailerBrandsLimit();
|
| 898 |
|
- |
|
| 899 |
// if (minStockLimit != 0) {
|
- |
|
| 900 |
//
|
- |
|
| 901 |
// retailerBrands.setMinStockLimit(minStockLimit);
|
- |
|
| 902 |
// } else {
|
- |
|
| 903 |
// retailerBrands.setMinStockLimit(preStockLimit);
|
- |
|
| 904 |
// }
|
- |
|
| 905 |
// if (limit != 0) {
|
- |
|
| 906 |
// retailerBrands.setBrandLimit(limit);
|
- |
|
| 907 |
// } else {
|
- |
|
| 908 |
// retailerBrands.setBrandLimit(preLimit);
|
- |
|
| 909 |
// }
|
- |
|
| 910 |
retailerBrands.setMinStockLimit(minStockLimit);
|
898 |
retailerBrands.setMinStockLimit(minStockLimit);
|
| 911 |
retailerBrands.setBrandLimit(limit);
|
899 |
retailerBrands.setBrandLimit(limit);
|
| 912 |
|
- |
|
| 913 |
retailerBrands.setIsUpdate(1);
|
900 |
retailerBrands.setIsUpdate(1);
|
| 914 |
retailerBrands.setCreatedTimestamp(LocalDateTime.now());
|
901 |
retailerBrands.setCreatedTimestamp(LocalDateTime.now());
|
| 915 |
retailerBrands.setPartnerId(fofoId);
|
902 |
retailerBrands.setPartnerId(fofoId);
|
| 916 |
retailerBrands.setBrandName(brand);
|
903 |
retailerBrands.setBrandName(brand);
|
| 917 |
retailerBrands.setUpdatedTimestamp(LocalDateTime.now());
|
904 |
retailerBrands.setUpdatedTimestamp(LocalDateTime.now());
|
| 918 |
retailerBrandsLimitRepository.persist(retailerBrands);
|
905 |
retailerBrandsLimitRepository.persist(retailerBrands);
|
| 919 |
} else {
|
906 |
} else {
|
| 920 |
// if (minStockLimit != 0) {
|
- |
|
| 921 |
// retailerBrands.setMinStockLimit(minStockLimit);
|
- |
|
| 922 |
// } else {
|
- |
|
| 923 |
// retailerBrands.setMinStockLimit(preStockLimit);
|
- |
|
| 924 |
// }
|
- |
|
| 925 |
//
|
- |
|
| 926 |
// if (limit != 0) {
|
- |
|
| 927 |
// retailerBrands.setBrandLimit(limit);
|
- |
|
| 928 |
// } else {
|
- |
|
| 929 |
// retailerBrands.setBrandLimit(preLimit);
|
- |
|
| 930 |
// }
|
- |
|
| 931 |
retailerBrands.setMinStockLimit(minStockLimit);
|
907 |
retailerBrands.setMinStockLimit(minStockLimit);
|
| 932 |
retailerBrands.setBrandLimit(limit);
|
908 |
retailerBrands.setBrandLimit(limit);
|
| 933 |
retailerBrands.setIsUpdate(1);
|
909 |
retailerBrands.setIsUpdate(1);
|
| 934 |
retailerBrands.setUpdatedTimestamp(LocalDateTime.now());
|
910 |
retailerBrands.setUpdatedTimestamp(LocalDateTime.now());
|
| 935 |
retailerBrandsLimitRepository.persist(retailerBrands);
|
911 |
retailerBrandsLimitRepository.persist(retailerBrands);
|
| Line 956... |
Line 932... |
| 956 |
public String getRetailerBrandslimit(HttpServletRequest request,
|
932 |
public String getRetailerBrandslimit(HttpServletRequest request,
|
| 957 |
@RequestParam(name = "brand", required = true, defaultValue = "0") String brand, Model model)
|
933 |
@RequestParam(name = "brand", required = true, defaultValue = "0") String brand, Model model)
|
| 958 |
throws Exception {
|
934 |
throws Exception {
|
| 959 |
|
935 |
|
| 960 |
Map<Integer, CustomRetailer> customRetailers = retailerService.getFofoRetailers(true);
|
936 |
Map<Integer, CustomRetailer> customRetailers = retailerService.getFofoRetailers(true);
|
| 961 |
List<RetailerBrandsLimit> retailerBrandsLimit = retailerBrandsLimitRepository.setAllLimitByBrands(brand);
|
937 |
List<RetailerBrandsLimit> retailerBrandsLimit = retailerBrandsLimitRepository.setAllLimitByBrand(brand);
|
| 962 |
Map<Integer, RetailerBrandsLimit> retailerBrandsLimitMap = retailerBrandsLimit.stream()
|
938 |
Map<Integer, RetailerBrandsLimit> retailerBrandsLimitMap = retailerBrandsLimit.stream()
|
| 963 |
.collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
|
939 |
.collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
|
| 964 |
|
940 |
|
| 965 |
model.addAttribute("customRetailers", customRetailers);
|
941 |
model.addAttribute("customRetailers", customRetailers);
|
| 966 |
model.addAttribute("brand", brand);
|
942 |
model.addAttribute("brand", brand);
|
| Line 982... |
Line 958... |
| 982 |
|
958 |
|
| 983 |
LOGGER.info("limit" + limit);
|
959 |
LOGGER.info("limit" + limit);
|
| 984 |
|
960 |
|
| 985 |
BrandLimit brandLimit = brandLimitRepository.setLimitByBrands(brands);
|
961 |
BrandLimit brandLimit = brandLimitRepository.setLimitByBrands(brands);
|
| 986 |
|
962 |
|
| 987 |
List<RetailerBrandsLimit> retailerBrandsLimit = retailerBrandsLimitRepository.setAllLimitByBrands(brands);
|
963 |
List<RetailerBrandsLimit> retailerBrandsLimit = retailerBrandsLimitRepository.setAllLimitByBrand(brands);
|
| 988 |
|
964 |
|
| 989 |
Map<Integer, RetailerBrandsLimit> retailerBrandsLimitMap = retailerBrandsLimit.stream()
|
965 |
Map<Integer, RetailerBrandsLimit> retailerBrandsLimitMap = retailerBrandsLimit.stream()
|
| 990 |
.collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
|
966 |
.collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
|
| 991 |
|
967 |
|
| 992 |
Map<Integer, CustomRetailer> customRetailers = retailerService.getFofoRetailers(true);
|
968 |
Map<Integer, CustomRetailer> customRetailers = retailerService.getFofoRetailers(true);
|
| Line 1028... |
Line 1004... |
| 1028 |
|
1004 |
|
| 1029 |
LOGGER.info("limit" + stockLimit);
|
1005 |
LOGGER.info("limit" + stockLimit);
|
| 1030 |
|
1006 |
|
| 1031 |
BrandLimit brandLimit = brandLimitRepository.setLimitByBrands(brands);
|
1007 |
BrandLimit brandLimit = brandLimitRepository.setLimitByBrands(brands);
|
| 1032 |
|
1008 |
|
| 1033 |
List<RetailerBrandsLimit> retailerBrandsLimit = retailerBrandsLimitRepository.setAllLimitByBrands(brands);
|
1009 |
List<RetailerBrandsLimit> retailerBrandsLimit = retailerBrandsLimitRepository.setAllLimitByBrand(brands);
|
| 1034 |
|
1010 |
|
| 1035 |
Map<Integer, RetailerBrandsLimit> retailerBrandsLimitMap = retailerBrandsLimit.stream()
|
1011 |
Map<Integer, RetailerBrandsLimit> retailerBrandsLimitMap = retailerBrandsLimit.stream()
|
| 1036 |
.collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
|
1012 |
.collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
|
| 1037 |
|
1013 |
|
| 1038 |
Map<Integer, CustomRetailer> customRetailers = retailerService.getFofoRetailers(true);
|
1014 |
Map<Integer, CustomRetailer> customRetailers = retailerService.getFofoRetailers(true);
|
| Line 1074... |
Line 1050... |
| 1074 |
|
1050 |
|
| 1075 |
if (!pincode.equals("")) {
|
1051 |
if (!pincode.equals("")) {
|
| 1076 |
PincodePartner pinPartner = new PincodePartner();
|
1052 |
PincodePartner pinPartner = new PincodePartner();
|
| 1077 |
pinPartner.setFofoId(fofoId);
|
1053 |
pinPartner.setFofoId(fofoId);
|
| 1078 |
pinPartner.setPincode(pincode);
|
1054 |
pinPartner.setPincode(pincode);
|
| 1079 |
PincodePartnerRepository.perist(pinPartner);
|
1055 |
pincodePartnerRepository.perist(pinPartner);
|
| 1080 |
}
|
1056 |
}
|
| 1081 |
|
1057 |
|
| 1082 |
List<PincodePartner> partnerPincodeList = PincodePartnerRepository.selectByPartnerId(fofoId);
|
1058 |
List<PincodePartner> partnerPincodeList = pincodePartnerRepository.selectByPartnerId(fofoId);
|
| 1083 |
|
1059 |
|
| 1084 |
LOGGER.info("partnerPincodeList" + partnerPincodeList);
|
1060 |
LOGGER.info("partnerPincodeList" + partnerPincodeList);
|
| 1085 |
|
1061 |
|
| 1086 |
model.addAttribute("partnerPincodeList", partnerPincodeList);
|
1062 |
model.addAttribute("partnerPincodeList", partnerPincodeList);
|
| 1087 |
return "pincode-partner-index";
|
1063 |
return "pincode-partner-index";
|
| Line 1091... |
Line 1067... |
| 1091 |
@RequestMapping(value = "/removePartnerPincode", method = RequestMethod.POST)
|
1067 |
@RequestMapping(value = "/removePartnerPincode", method = RequestMethod.POST)
|
| 1092 |
public String removePartnerPincode(HttpServletRequest request, @RequestParam int id,
|
1068 |
public String removePartnerPincode(HttpServletRequest request, @RequestParam int id,
|
| 1093 |
@RequestParam(name = "fofoId", required = true, defaultValue = "") int fofoId, Model model)
|
1069 |
@RequestParam(name = "fofoId", required = true, defaultValue = "") int fofoId, Model model)
|
| 1094 |
throws Exception {
|
1070 |
throws Exception {
|
| 1095 |
|
1071 |
|
| 1096 |
PincodePartnerRepository.delete(id);
|
1072 |
pincodePartnerRepository.delete(id);
|
| 1097 |
|
1073 |
|
| 1098 |
List<PincodePartner> partnerPincodeList = PincodePartnerRepository.selectByPartnerId(fofoId);
|
1074 |
List<PincodePartner> partnerPincodeList = pincodePartnerRepository.selectByPartnerId(fofoId);
|
| 1099 |
|
1075 |
|
| 1100 |
LOGGER.info("partnerPincodeList" + partnerPincodeList);
|
1076 |
LOGGER.info("partnerPincodeList" + partnerPincodeList);
|
| 1101 |
|
1077 |
|
| 1102 |
model.addAttribute("partnerPincodeList", partnerPincodeList);
|
1078 |
model.addAttribute("partnerPincodeList", partnerPincodeList);
|
| 1103 |
|
1079 |
|
| Line 1109... |
Line 1085... |
| 1109 |
public String removeSearchPincode(HttpServletRequest request, @RequestParam int id,
|
1085 |
public String removeSearchPincode(HttpServletRequest request, @RequestParam int id,
|
| 1110 |
@RequestParam(name = "pin", required = true, defaultValue = "") String pin,
|
1086 |
@RequestParam(name = "pin", required = true, defaultValue = "") String pin,
|
| 1111 |
@RequestParam(name = "fofoId", required = true, defaultValue = "") int fofoId, Model model)
|
1087 |
@RequestParam(name = "fofoId", required = true, defaultValue = "") int fofoId, Model model)
|
| 1112 |
throws Exception {
|
1088 |
throws Exception {
|
| 1113 |
|
1089 |
|
| 1114 |
PincodePartnerRepository.delete(id);
|
1090 |
pincodePartnerRepository.delete(id);
|
| 1115 |
|
1091 |
|
| 1116 |
List<PincodePartner> partnerPincodeList = PincodePartnerRepository.selectPartnersByPincode(pin);
|
1092 |
List<PincodePartner> partnerPincodeList = pincodePartnerRepository.selectPartnersByPincode(pin);
|
| 1117 |
|
1093 |
|
| 1118 |
Map<Integer, CustomRetailer> customRetailerMap = retailerService.getFofoRetailers(true);
|
1094 |
Map<Integer, CustomRetailer> customRetailerMap = retailerService.getFofoRetailers(true);
|
| 1119 |
|
1095 |
|
| 1120 |
model.addAttribute("customRetailerMap", customRetailerMap);
|
1096 |
model.addAttribute("customRetailerMap", customRetailerMap);
|
| 1121 |
|
1097 |
|
| Line 1128... |
Line 1104... |
| 1128 |
@RequestMapping(value = "/searchPincodePartner", method = RequestMethod.GET)
|
1104 |
@RequestMapping(value = "/searchPincodePartner", method = RequestMethod.GET)
|
| 1129 |
public String searchPincodePartner(HttpServletRequest request,
|
1105 |
public String searchPincodePartner(HttpServletRequest request,
|
| 1130 |
@RequestParam(name = "pincode", required = true, defaultValue = "") String pincode, Model model)
|
1106 |
@RequestParam(name = "pincode", required = true, defaultValue = "") String pincode, Model model)
|
| 1131 |
throws Exception {
|
1107 |
throws Exception {
|
| 1132 |
|
1108 |
|
| 1133 |
List<PincodePartner> partnerPincodeList = PincodePartnerRepository.selectPartnersByPincode(pincode);
|
1109 |
List<PincodePartner> partnerPincodeList = pincodePartnerRepository.selectPartnersByPincode(pincode);
|
| 1134 |
|
1110 |
|
| 1135 |
Map<Integer, CustomRetailer> customRetailerMap = retailerService.getFofoRetailers(true);
|
1111 |
Map<Integer, CustomRetailer> customRetailerMap = retailerService.getFofoRetailers(true);
|
| 1136 |
|
1112 |
|
| 1137 |
model.addAttribute("customRetailerMap", customRetailerMap);
|
1113 |
model.addAttribute("customRetailerMap", customRetailerMap);
|
| 1138 |
|
1114 |
|
| Line 1145... |
Line 1121... |
| 1145 |
@RequestMapping(value = "/showPartnerPincode", method = RequestMethod.GET)
|
1121 |
@RequestMapping(value = "/showPartnerPincode", method = RequestMethod.GET)
|
| 1146 |
public String showPartnerPincode(HttpServletRequest request,
|
1122 |
public String showPartnerPincode(HttpServletRequest request,
|
| 1147 |
@RequestParam(name = "partnerId", required = true, defaultValue = "") int partnerId, Model model)
|
1123 |
@RequestParam(name = "partnerId", required = true, defaultValue = "") int partnerId, Model model)
|
| 1148 |
throws Exception {
|
1124 |
throws Exception {
|
| 1149 |
|
1125 |
|
| 1150 |
List<PincodePartner> partnerPincodeList = PincodePartnerRepository.selectByPartnerId(partnerId);
|
1126 |
List<PincodePartner> partnerPincodeList = pincodePartnerRepository.selectByPartnerId(partnerId);
|
| 1151 |
|
1127 |
|
| 1152 |
model.addAttribute("partnerPincodeList", partnerPincodeList);
|
1128 |
model.addAttribute("partnerPincodeList", partnerPincodeList);
|
| 1153 |
|
1129 |
|
| 1154 |
return "pincode-partner-index";
|
1130 |
return "pincode-partner-index";
|
| 1155 |
|
1131 |
|