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

Merge remote-tracking branch 'origin/mark' into yonghui

Browse Source
This commit is contained in:
苏尹岚
2019-12-30 15:11:29 +08:00
parent cb135a0adf a56ebdf5dd
commit e82d9851de
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/jxcallback/orderman/orderman_ext.go
View File

@@ -181,7 +181,7 @@ func (c *OrderManager) GetOrderWaybillInfo(ctx *jxcontext.Context, vendorOrderID
if err == nil && isGetPos {
var taskBills []*model.WaybillExt
for _, v := range bills {
if v.Status >= model.WaybillStatusAccepted && v.Status <= model.WaybillStatusDelivering {
if true /*v.Status >= model.WaybillStatusAccepted && v.Status <= model.WaybillStatusDelivering*/ {
if handler := partner.GetRidderPositionGetter(v.WaybillVendorID); handler != nil {
taskBills = append(taskBills, v)
}

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

@@ -244,7 +244,7 @@ func sku2Update(vendorID int, sku *dao.StoreSkuSyncInfo, syncStatus int8) (item
kvs[dao.GetVendorThingIDStructField(model.VendorNames[vendorID])] = utils.Str2Int64WithDefault(sku.VendorSkuID, 0)
} else if model.IsSyncStatusDelete(syncStatus) {
sku.SkuSyncStatus = 0
if utils.IsTimeZero(sku.BindDeletedAt) && (sku.ID == 0 || sku.NameID == 0) {
if utils.IsTimeZero(sku.BindDeletedAt) && (sku.NameID == 0) {
kvs[model.FieldDeletedAt] = time.Now()
}
if !dao.IsVendorThingIDEmpty(sku.VendorSkuID) && !partner.IsMultiStore(vendorID) {