WebSVN – SmartDukaan – Diff – //trunk/PyProj/src/shop2020/model/v1/catalog/script/AmazonHistoryPopulator.py

     def __init__(self, ourSp, lowestPossibleSp):
         self.ourSp = ourSp
         self.lowestPossibleSp = lowestPossibleSp
 class __Promotion:
-    def __init__(self, promoPrice, subsidy, promotionType):
+    def __init__(self, promoPrice, subsidy, promotionType,expiryDate):
         self.promoPrice = promoPrice
         self.subsidy = subsidy
         self.promotionType = promotionType
+        self.expiryDate = expiryDate
 def fetchItemsForAutoDecrease(time):
     successfulAutoDecrease = []
         except:
             daysOfStock = float("inf")
         if autoDecrementItem.competitiveCategory == CompetitionCategory.AMONG_CHEAPEST_CAN_COMPETE:
             if daysOfStock < 20:
                 markReasonForItem(autoDecrementItem,'Days of stock less than 20',Decision.AUTO_DECREMENT_FAILED)
+                continue
-        if autoDecrementItem.competitiveCategory == CompetitionCategory.COMPETITIVE:
+        if autoDecrementItem.competitiveCategory == CompetitionCategory.COMPETITIVE and not autoDecrementItem.isPromotion:
             if autoDecrementItem.parentCategoryId in [10006,10009,11001]:
-                if daysOfStock < 1:
+                if daysOfStock < 1 :
                     markReasonForItem(autoDecrementItem,'Days of stock less than 1',Decision.AUTO_DECREMENT_FAILED)
+                    continue
             else:
                 if daysOfStock < 3:
                     markReasonForItem(autoDecrementItem,'Days of stock less than 3',Decision.AUTO_DECREMENT_FAILED)
+                    continue
+        if autoDecrementItem.competitiveCategory == CompetitionCategory.COMPETITIVE and autoDecrementItem.isPromotion:
+            if autoDecrementItem.parentCategoryId in [10006,10009,11001]:
+                if (amazonLongTermActivePromotions.get(sku).expiryDate - datetime.now()).days >2 and daysOfStock < 1 :
+                    markReasonForItem(autoDecrementItem,'Promo Item, expiry after 2 days or not enough stock',Decision.AUTO_DECREMENT_FAILED)
+                    continue
+            else:
+                if (amazonLongTermActivePromotions.get(sku).expiryDate - datetime.now()).days >2 and daysOfStock < 3:
+                    markReasonForItem(autoDecrementItem,'Promo Item, expiry after 2 days or not enough stock',Decision.AUTO_DECREMENT_FAILED)
+                    continue
         autoDecrementItem.ourEnoughStock=True
         autoDecrementItem.decision = Decision.AUTO_DECREMENT_SUCCESS
         autoDecrementItem.reason = 'All conditions for auto decrement true'
         successfulAutoDecrease.append(autoDecrementItem)
         amazonItemInfo = __AmazonItemInfo(None, wanlc,cc, sku, it.product_group, it.brand, it.model_name, it.model_number, it.color, it.weight, category.parent_category_id, it.risky, None, runType, parent_category.display_name,sourcePercentage,fbaInventoryItem.availability,state_id)
         itemInfo.append(amazonItemInfo)
     amPromotions = AmazonPromotion.query.filter(AmazonPromotion.startDate<=time).filter(AmazonPromotion.endDate>=time).filter(AmazonPromotion.promotionType==AmazonPromotionType.LONGTERM).filter(AmazonPromotion.promotionActive==True) \
     .group_by(AmazonPromotion.sku).order_by(desc(AmazonPromotion.addedOn)).all()
     for amPromotion in amPromotions:
-        amazonLongTermActivePromotions[amPromotion.sku] = __Promotion(amPromotion.salePrice,amPromotion.subsidy,amPromotion.promotionType)
+        amazonLongTermActivePromotions[amPromotion.sku] = __Promotion(amPromotion.salePrice,amPromotion.subsidy,amPromotion.promotionType,amPromotion.endDate)
     amPromotions = AmazonPromotion.query.filter(AmazonPromotion.startDate<=time).filter(AmazonPromotion.endDate>=time).filter(AmazonPromotion.promotionType==AmazonPromotionType.SHORTTERM).filter(AmazonPromotion.promotionActive==True) \
     .group_by(AmazonPromotion.sku).order_by(desc(AmazonPromotion.addedOn)).all()
     for amPromotion in amPromotions:
-        amazonShortTermActivePromotions[amPromotion.sku] = __Promotion(amPromotion.salePrice,amPromotion.subsidy,amPromotion.promotionType)
+        amazonShortTermActivePromotions[amPromotion.sku] = __Promotion(amPromotion.salePrice,amPromotion.subsidy,amPromotion.promotionType,amPromotion.endDate)
     session.close()
     return itemInfo
 def getPriceAndAsin(itemInfo):
     skus = []
         amazonScrapingHistory.totalSeller = amDetails.totalSeller
         amazonScrapingHistory.competitiveCategory = CompetitionCategory.BUY_BOX
         amazonScrapingHistory.timestamp = timestamp
         amazonScrapingHistory.multipleListings = amDetails.multipleListings
         proposed_sp = max(amDetails.secondLowestSellerSp - max((20, amDetails.secondLowestSellerSp*0.002)), amPricing.lowestPossibleSp)
+        if amazonScrapingHistory.isPromotion:
+            if amazonLongTermActivePromotions.has_key(val.sku):
+                proposed_sp = min(proposed_sp,(amazonLongTermActivePromotions.has_key(val.sku)).salePrice)
+            else:
+                proposed_sp = min(proposed_sp,(amazonShortTermActivePromotions.has_key(val.sku)).salePrice)
         proposed_tp = getTargetTp(proposed_sp,spm,val)
         amazonScrapingHistory.proposedSp = proposed_sp
         amazonScrapingHistory.proposedTp = proposed_tp
         amazonScrapingHistory.marginIncreasedPotential = proposed_tp - amPricing.ourTp
         amazonScrapingHistory.multipleListings = amDetails.multipleListings

Subversion Repositories SmartDukaan

(root)//trunk/PyProj/src/shop2020/model/v1/catalog/script/AmazonHistoryPopulator.py – Rev 12432 → 12433