Subversion Repositories SmartDukaan

Rev

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

Rev 34190 Rev 34196
Line 1020... Line 1020...
1020 
                        fdi.setMrp(childItem.getDouble("mrp_f"));
 1020 
                        fdi.setMrp(childItem.getDouble("mrp_f"));
1021 
                        fdi.setMop((float) childItem.getDouble("mop_f"));
 1021 
                        fdi.setMop((float) childItem.getDouble("mop_f"));
1022 
                        fdi.setColor(childItem.has("color_s") ? childItem.getString("color_s") : "");
 1022 
                        fdi.setColor(childItem.has("color_s") ? childItem.getString("color_s") : "");
1023 
                        fdi.setTagId(childItem.getInt("tagId_i"));
 1023 
                        fdi.setTagId(childItem.getInt("tagId_i"));
1024 
                        fdi.setItem_id(itemId);
 1024 
                        fdi.setItem_id(itemId);
- 
 
 1025 
                        fdi.setCatalog_id(doc.getInt("catalogId_i"));
1025 
                        Float cashBack = schemeService.getCatalogSchemeCashBack(fofoId, Arrays.asList(ffdr.getCatalogId())).get(ffdr.getCatalogId());
 1026 
                        Float cashBack = schemeService.getCatalogSchemeCashBack(fofoId, Arrays.asList(ffdr.getCatalogId())).get(ffdr.getCatalogId());
1026 
                        cashBack = cashBack == null ? 0 : cashBack;
 1027 
                        cashBack = cashBack == null ? 0 : cashBack;
1027 
                        // TODO:Dont commit
 1028 
                        // TODO:Dont commit
1028 
                        // fdi.setCashback(Math.min(100, fdi.getMop()));
 1029 
                        // fdi.setCashback(Math.min(100, fdi.getMop()));
1029 
                        fdi.setCashback(cashBack);
 1030 
                        fdi.setCashback(cashBack);