Subversion Repositories SmartDukaan

Rev

Rev 37631 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 37631 Rev 37636
Line 23... Line 23...
23
import com.spice.profitmandi.dao.entity.catalog.*;
23
import com.spice.profitmandi.dao.entity.catalog.*;
24
import com.spice.profitmandi.dao.entity.dtr.*;
24
import com.spice.profitmandi.dao.entity.dtr.*;
25
import com.spice.profitmandi.dao.entity.fofo.*;
25
import com.spice.profitmandi.dao.entity.fofo.*;
26
import com.spice.profitmandi.dao.entity.inventory.SaholicInventorySnapshot;
26
import com.spice.profitmandi.dao.entity.inventory.SaholicInventorySnapshot;
27
import com.spice.profitmandi.dao.entity.inventory.SaholicReservationSnapshot;
27
import com.spice.profitmandi.dao.entity.inventory.SaholicReservationSnapshot;
28
import com.spice.profitmandi.dao.entity.inventory.VendorItemPricing;
-
 
29
import com.spice.profitmandi.dao.entity.transaction.*;
28
import com.spice.profitmandi.dao.entity.transaction.*;
30
import com.spice.profitmandi.dao.entity.user.Address;
29
import com.spice.profitmandi.dao.entity.user.Address;
31
import com.spice.profitmandi.dao.entity.user.User;
30
import com.spice.profitmandi.dao.entity.user.User;
32
import com.spice.profitmandi.dao.entity.warehouse.BrandRegionMapping;
31
import com.spice.profitmandi.dao.entity.warehouse.BrandRegionMapping;
33
import com.spice.profitmandi.dao.entity.warehouse.WarehouseInventoryItem;
32
import com.spice.profitmandi.dao.entity.warehouse.WarehouseInventoryItem;
Line 53... Line 52...
53
import com.spice.profitmandi.dao.entity.fofo.ActivityType;
52
import com.spice.profitmandi.dao.entity.fofo.ActivityType;
54
import com.spice.profitmandi.dao.repository.dtr.*;
53
import com.spice.profitmandi.dao.repository.dtr.*;
55
import com.spice.profitmandi.dao.repository.fofo.*;
54
import com.spice.profitmandi.dao.repository.fofo.*;
56
import com.spice.profitmandi.dao.repository.inventory.SaholicInventorySnapshotRepository;
55
import com.spice.profitmandi.dao.repository.inventory.SaholicInventorySnapshotRepository;
57
import com.spice.profitmandi.dao.repository.inventory.SaholicReservationSnapshotRepository;
56
import com.spice.profitmandi.dao.repository.inventory.SaholicReservationSnapshotRepository;
58
import com.spice.profitmandi.dao.repository.inventory.VendorItemPricingRepository;
-
 
59
import com.spice.profitmandi.dao.repository.inventory.WarehouseRepository;
57
import com.spice.profitmandi.dao.repository.inventory.WarehouseRepository;
60
import com.spice.profitmandi.dao.repository.transaction.*;
58
import com.spice.profitmandi.dao.repository.transaction.*;
61
import com.spice.profitmandi.dao.repository.user.AddressRepository;
59
import com.spice.profitmandi.dao.repository.user.AddressRepository;
62
import com.spice.profitmandi.dao.repository.user.CartRepository;
60
import com.spice.profitmandi.dao.repository.user.CartRepository;
63
import com.spice.profitmandi.dao.repository.user.FofoKycRepository;
61
import com.spice.profitmandi.dao.repository.user.FofoKycRepository;
Line 154... Line 152...
154
 
152
 
155
    @Autowired
153
    @Autowired
156
    InsuranceService insuranceService;
154
    InsuranceService insuranceService;
157
 
155
 
158
    @Autowired
156
    @Autowired
159
    private VendorItemPricingRepository vendorItemPricingRepository;
-
 
160
 
-
 
161
    @Autowired
-
 
162
    private WarehouseRepository warehouseRepository;
157
    private WarehouseRepository warehouseRepository;
163
 
158
 
164
    @Autowired
159
    @Autowired
165
    private PurchaseReturnItemRepository purchaseReturnItemRepository;
160
    private PurchaseReturnItemRepository purchaseReturnItemRepository;
166
 
161
 
Line 1728... Line 1723...
1728
            LineItem lineItem = lineItemRepository.selectById(order.getLineItem().getId());
1723
            LineItem lineItem = lineItemRepository.selectById(order.getLineItem().getId());
1729
            if (order.getOrderType() == null) {
1724
            if (order.getOrderType() == null) {
1730
                order.setProductCondition(0);
1725
                order.setProductCondition(0);
1731
                order.setOrderType(0);
1726
                order.setOrderType(0);
1732
                int itemId = order.getLineItem().getItemId();
1727
                int itemId = order.getLineItem().getItemId();
1733
                int fulfillmentWarehouseId = order.getFulfilmentWarehouseId();
-
 
1734
                System.out.println("Item id " + itemId);
1728
                System.out.println("Item id " + itemId);
1735
                Item item = itemRepository.selectById(itemId);
1729
                Item item = itemRepository.selectById(itemId);
1736
 
-
 
1737
                VendorItemPricing vendorItemPricing = vendorItemPricingRepository.selectByItemIdAndVendorId(itemId,
-
 
1738
                        fulfillmentWarehouseId);
-
 
1739
                if (vendorItemPricing == null) {
-
 
1740
                    vendorItemPricing = vendorItemPricingRepository.selectAll(itemId).get(0);
-
 
1741
                }
-
 
1742
                System.out.println("vendorItemPricing " + vendorItemPricing);
-
 
1743
                lineItem.setProductGoup(item.getProductGroup());
1730
                lineItem.setProductGoup(item.getProductGroup());
1744
                lineItem.setColor(item.getColor());
1731
                lineItem.setColor(item.getColor());
1745
                lineItem.setNlc(vendorItemPricing.getNlc());
-
 
1746
                lineItem.setTransferPrice(vendorItemPricing.getTp());
-
 
1747
                lineItem.setLogisticsCost(0f);
1732
                lineItem.setLogisticsCost(0f);
1748
                lineItem.setCodCollectionCharges(0f);
1733
                lineItem.setCodCollectionCharges(0f);
1749
 
1734
 
1750
            }
1735
            }
1751
 
1736