liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aa

Browse Source
This commit is contained in:
suyl
2021-06-07 14:31:43 +08:00
parent a5e63f1484
commit c4eecaffef
3 changed files with 14 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
business/jxcallback/orderman/order.go
View File

@@ -227,7 +227,7 @@ func (c *OrderManager) OnOrderStatusChanged(vendorOrgCode string, orderStatus *m
} else if orderStatus.Status == model.OrderStatusCanceled { } else if orderStatus.Status == model.OrderStatusCanceled {
//如果取消订单则要把库存加回去 //如果取消订单则要把库存加回去
if order, err2 := c.LoadOrder(orderStatus.VendorOrderID, orderStatus.VendorID); err2 == nil { if order, err2 := c.LoadOrder(orderStatus.VendorOrderID, orderStatus.VendorID); err2 == nil {
ModifyOrderSkusStock(db, order, true) //ModifyOrderSkusStock(db, order, true)
//门店发单的订单，取消后要退回配送费 //门店发单的订单，取消后要退回配送费
resetCreateWaybillFee(db, order) resetCreateWaybillFee(db, order)
} }
@@ -357,9 +357,9 @@ func (c *OrderManager) SaveOrder(order *model.GoodsOrder, isAdjust bool, db *dao
//globals.SugarLogger.Warnf("saveOrder create order:%v, error:%v", order, err) //globals.SugarLogger.Warnf("saveOrder create order:%v, error:%v", order, err)
} }
//修改商品库存 //修改商品库存
if err == nil { //if err == nil {
err = ModifyOrderSkusStock(db, order, false) // err = ModifyOrderSkusStock(db, order, false)
} //}
if err == nil { if err == nil {
dao.Commit(db, txDB) dao.Commit(db, txDB)
} }

20
business/jxstore/cms/sync_store_sku.go
View File

@@ -264,9 +264,9 @@ func storeSkuSyncInfo2Bare(inSku *dao.StoreSkuSyncInfo) (outSku *partner.StoreSk
Stock: inSku.Stock, Stock: inSku.Stock,
VendorOrgCode: inSku.VendorOrgCode, VendorOrgCode: inSku.VendorOrgCode,
} }
// if !isStoreSkuSyncNeedDelete(inSku) { if !isStoreSkuSyncNeedDelete(inSku) {
// outSku.Stock = model.MaxStoreSkuStockQty outSku.Stock = model.MaxStoreSkuStockQty
// } }
return outSku return outSku
} }
@@ -561,7 +561,7 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
} }
if sku.MergedStatus == model.SkuStatusNormal { if sku.MergedStatus == model.SkuStatusNormal {
onlineList = append(onlineList, bareSku) onlineList = append(onlineList, bareSku)
// stockList = append(stockList, bareSku) stockList = append(stockList, bareSku)
} else { } else {
offlineList = append(offlineList, bareSku) offlineList = append(offlineList, bareSku)
// 因为京东平台以是否有库存表示是否关注，所以不论是否可售，都要设置库存 // 因为京东平台以是否有库存表示是否关注，所以不论是否可售，都要设置库存
@@ -570,12 +570,12 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
// } // }
} }
} }
if model.IsSyncStatusStock(sku.SkuSyncStatus) { //if model.IsSyncStatusStock(sku.SkuSyncStatus) {
if bareSku == nil { // if bareSku == nil {
bareSku = storeSkuSyncInfo2Bare(sku) // bareSku = storeSkuSyncInfo2Bare(sku)
} // }
stockList = append(stockList, bareSku) // stockList = append(stockList, bareSku)
} //}
} }
isNeedReorder = model.IsSyncStatusSeq(sku.SkuSyncStatus) isNeedReorder = model.IsSyncStatusSeq(sku.SkuSyncStatus)
} }

31
business/jxstore/tempop/tempop.go
View File

@@ -4,7 +4,6 @@ import (
"bytes" "bytes"
"context" "context"
"fmt" "fmt"
"git.rosy.net.cn/baseapi/platformapi/mtpsapi"
"regexp" "regexp"
"strings" "strings"
"time" "time"
@@ -1924,36 +1923,6 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
// dao.UpdateEntity(db, v, "ConsigneeMobile2") // dao.UpdateEntity(db, v, "ConsigneeMobile2")
// } // }
//} //}
var (
db = dao.GetDB()
)
courierStoreList, _ := dao.GetStoreCourierList(db, nil, []int{model.VendorIDMTPS}, model.StoreStatusAll, model.StoreAuditStatusAll)
task := tasksch.NewParallelTask("uuuuuu", tasksch.NewParallelConfig().SetIsContinueWhenError(true), ctx,
func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
courierStore := batchItemList[0].(*model.StoreCourierMap)
storeDetail, _ := dao.GetStoreDetail(db, courierStore.StoreID, model.VendorIDJX, "")
result, _ := api.MtpsAPI.GetStoreInfoByID(utils.Str2Int(courierStore.VendorStoreID))
name := fmt.Sprintf("%s-%s-%s", globals.StoreName, storeDetail.CityName, storeDetail.Name)
if result != nil {
if result.PoiName != name {
shopInfo := &mtpsapi.ShopInfo{
ShopID: utils.Int2Str(storeDetail.ID),
ShopName: name,
}
api.MtpsAPI.ShopUpdate(shopInfo)
}
if result.OpenType != courierStore.VendorStatus {
courierStore.VendorStatus = result.OpenType
dao.UpdateEntity(db, courierStore, "VendorStatus")
}
} else {
courierStore.VendorStatus = 0
dao.UpdateEntity(db, courierStore, "VendorStatus")
}
return retVal, err
}, courierStoreList)
tasksch.HandleTask(task, nil, true).Run()
task.GetID()
return err return err
} }