Subversion Repositories SmartDukaan

Rev

Rev 34191 | Rev 34260 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 34191 Rev 34196
Line 972... Line 972...
972
                        }
972
                        }
973
                        fdi.setBrand((String) doc.getJSONArray("brand_ss").get(0));
973
                        fdi.setBrand((String) doc.getJSONArray("brand_ss").get(0));
974
                        fdi.setCategoryId(doc.getInt("subCategoryId_i"));
974
                        fdi.setCategoryId(doc.getInt("subCategoryId_i"));
975
                        fdi.setTagId(childItem.getInt("tagId_i"));
975
                        fdi.setTagId(childItem.getInt("tagId_i"));
976
                        fdi.setItem_id(itemId);
976
                        fdi.setItem_id(itemId);
-
 
977
                        fdi.setCatalog_id(doc.getInt("catalogId_i"));
977
                        Float cashBack = schemeService.getCatalogSchemeCashBack(fofoId, Arrays.asList(fofoCatalogResponse.getCatalogId())).get(fofoCatalogResponse.getCatalogId());
978
                        Float cashBack = schemeService.getCatalogSchemeCashBack(fofoId, Arrays.asList(fofoCatalogResponse.getCatalogId())).get(fofoCatalogResponse.getCatalogId());
978
                        cashBack = cashBack == null ? 0 : cashBack;
979
                        cashBack = cashBack == null ? 0 : cashBack;
979
                        fdi.setCashback(cashBack);
980
                        fdi.setCashback(cashBack);
980
                        fdi.setMinBuyQuantity(1);
981
                        fdi.setMinBuyQuantity(1);
981
                        if (hotDeal) {
982
                        if (hotDeal) {
Line 1074... Line 1075...
1074
                    fdi.setMop((float) childItem.getDouble("mop_f"));
1075
                    fdi.setMop((float) childItem.getDouble("mop_f"));
1075
                    fdi.setMop((float) tl.getMrp());
1076
                    fdi.setMop((float) tl.getMrp());
1076
                    fdi.setColor(childItem.has("color_s") ? childItem.getString("color_s") : "");
1077
                    fdi.setColor(childItem.has("color_s") ? childItem.getString("color_s") : "");
1077
                    fdi.setTagId(childItem.getInt("tagId_i"));
1078
                    fdi.setTagId(childItem.getInt("tagId_i"));
1078
                    fdi.setItem_id(itemId);
1079
                    fdi.setItem_id(itemId);
-
 
1080
                    fdi.setCatalog_id(doc.getInt("catalogId_i"));
1079
                    Item item = itemRepository.selectById(itemId);
1081
                    Item item = itemRepository.selectById(itemId);
1080
                    // In case its tampered glass moq should be 5
1082
                    // In case its tampered glass moq should be 5
1081
                    if (item.getCategoryId() == 10020) {
1083
                    if (item.getCategoryId() == 10020) {
1082
                        fdi.setMinBuyQuantity(10);
1084
                        fdi.setMinBuyQuantity(10);
1083
                    } else {
1085
                    } else {