- prevent modify promotion sku

This commit is contained in:
gazebo
2018-11-06 16:10:23 +08:00
parent ae267dcdbe
commit e0cf85ebb6
4 changed files with 74 additions and 20 deletions

View File

@@ -61,8 +61,9 @@ type SkuPrice struct {
type tPromotionItemInfo struct {
model.PromotionSku
EndAt time.Time
StoreID int `orm:"column(store_id)"`
EndAt time.Time
JdStoreID string `orm:"column(vendor_store_id)"`
JdSkuID int64 `orm:"column(jd_id)"`
}
type tSimpleStore struct {
@@ -604,14 +605,18 @@ func CancelJdPromotion(ctx *jxcontext.Context, promotionID int) (err error) {
// 每晚凌晨运行一次
func RefreshJdLockStoreSku() (err error) {
sql := `
SELECT t1.end_at, t2.store_id, t3.*
SELECT t1.end_at, t22.vendor_store_id, t32.jd_id, t3.*
FROM promotion t1
JOIN promotion_store t2 ON t1.id = t2.promotion_id
JOIN store_map t22 ON t2.store_id = t22.store_id AND t22.vendor_id = ? AND t22.deleted_at = ?
JOIN promotion_sku t3 ON t1.id = t3.promotion_id
JOIN sku t32 ON t3.sku_id = t32.id
WHERE t1.deleted_at = ? AND t1.vendor_id = ? AND t1.status = ? AND (t1.beginAt <= ? AND t1.endAt >= ?)
`
nowDate := utils.GetCurDate()
sqlParams := []interface{}{
model.VendorIDJD,
utils.DefaultTimeValue,
utils.DefaultTimeValue,
model.VendorIDJD,
model.PromotionStatusRemoteCreated,
@@ -651,9 +656,9 @@ func RefreshJdPromotionItemListLockStatus(promotionItemList []*tPromotionItemInf
expire := promotionItemList[0].EndAt.Add(24 * time.Hour)
for _, item := range promotionItemList {
if item.IsLock != 0 {
storeskulock.LockJdStoreSku(item.StoreID, item.SkuID, expire)
storeskulock.LockJdStoreSku(item.JdStoreID, item.JdSkuID, expire)
} else {
storeskulock.UnlockJdStoreSku(item.StoreID, item.SkuID)
storeskulock.UnlockJdStoreSku(item.JdStoreID, item.JdSkuID)
}
}
}
@@ -662,14 +667,18 @@ func RefreshJdPromotionItemListLockStatus(promotionItemList []*tPromotionItemInf
func RefreshJdPromotionLockStatus(promotionID int) (err error) {
sql := `
SELECT t1.end_at, t2.store_id, t3.*, IF(t1.begin_at <= ? AND t1.end_at >= ? AND t1.status = ?, t3.is_lock, 0) is_lock
SELECT t1.end_at, t22.vendor_store_id, t32.jd_id, IF(t1.begin_at <= ? AND t1.end_at >= ? AND t1.status = ?, t3.is_lock, 0) is_lock, t3.*
FROM promotion t1
JOIN promotion_store t2 ON t1.id = t2.promotion_id
JOIN store_map t22 ON t2.store_id = t22.store_id AND t22.vendor_id = ? AND t22.deleted_at = ?
JOIN promotion_sku t3 ON t1.id = t3.promotion_id
JOIN sku t32 ON t3.sku_id = t32.id
WHERE t1.id = ?
`
nowDate := utils.GetCurDate()
sqlParams := []interface{}{
model.VendorIDJD,
utils.DefaultTimeValue,
nowDate,
nowDate,
model.PromotionStatusRemoteCreated,
@@ -685,6 +694,38 @@ func RefreshJdPromotionLockStatus(promotionID int) (err error) {
return RefreshJdPromotionItemListLockStatus(promotionItemList)
}
func OnStoreStockMsg(msg *jdapi.CallbackStoreStockMsg) (retVal *jdapi.CallbackResponse) {
var err error
if (msg.Vendibility == 1 || !msg.Have) && storeskulock.IsJdStoreSkuLocked(msg.StationNo, msg.SkuId) {
db := dao.GetDB()
if msg.Vendibility == 1 {
sku := &model.Sku{}
sku.JdID = msg.SkuId
if err = dao.GetEntity(db, sku); err == nil {
if msg.Vendibility == 1 {
vendibility := &jdapi.StockVendibility{
OutSkuId: utils.Int2Str(sku.ID),
DoSale: true,
}
_, err = api.JdAPI.BatchUpdateVendibility("", msg.StationNo, []*jdapi.StockVendibility{
vendibility,
}, "prevent")
}
if !msg.Have {
stock := &jdapi.SkuStock{
OutSkuId: utils.Int2Str(sku.ID),
StockQty: model.MaxStoreSkuStockQty,
}
_, err = api.JdAPI.BatchUpdateCurrentQtys("", msg.StationNo, []*jdapi.SkuStock{
stock,
}, "prevent")
}
}
}
}
return jdapi.Err2CallbackResponse(err, "")
}
func excelStr2Time(timeStr string) (tm time.Time, err error) {
return time.ParseInLocation("2006年1月2日15点4分5秒", timeStr, time.Local)
}