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

1

Browse Source
This commit is contained in:
邹宗楠
2026-05-29 15:59:48 +08:00
parent ebf62108a9
commit c1f973df21
7 changed files with 65372 additions and 65336 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
business/jxstore/cms/sku.go
View File

@@ -2958,7 +2958,7 @@ func deleteJdsSku(db *dao.DaoDB, skuID int) (err error) {
return err
}
func UpdateSkuExinfoMap(ctx *jxcontext.Context, nameIDs []int, imgWaterMark string, brandID, vendorID int, vendorOrgCode, exPrefix, fromTime, toTime string, isAsync, isContinueWhenError bool) (hint string, err error) {
func UpdateSkuExinfoMap(ctx *jxcontext.Context, nameIDs []int, imgWaterMark string, brandID, vendorID int, vendorOrgCode, exPrefix, fromTime, toTime string, isAsync, isContinueWhenError bool, storeIds0 []int) (hint string, err error) {
var (
fromTimeP time.Time
toTimeP time.Time
@@ -3013,19 +3013,24 @@ func UpdateSkuExinfoMap(ctx *jxcontext.Context, nameIDs []int, imgWaterMark stri
for _, v := range skuList {
skuIDs = append(skuIDs, v.ID)
}
globals.SugarLogger.Debugf("---------test := %s", utils.Format4Output(partner.IsMultiStore(vendorID), false))
if partner.IsMultiStore(vendorID) {
for _, v := range skuIDs {
OnUpdateThing(ctx, db, nil, int64(v), model.ThingTypeSku)
}
} else {
var storeIDs []int
if brandID != 0 {
if len(storeIds0) != 0 {
storeIDs = storeIds0
} else if brandID != 0 {
if stores, _ := dao.GetStoreList(db, nil, nil, nil, []int{brandID}, nil, ""); len(stores) > 0 {
for _, v := range stores {
storeIDs = append(storeIDs, v.ID)
}
}
}
globals.SugarLogger.Debugf("---------test storeIDs:= %s", utils.Format4Output(storeIDs, false))
SetStoreSkuSyncStatus2(db, storeIDs, []int{vendorID}, skuIDs, model.SyncFlagModifiedMask)
}
}

6
business/partner/purchase/ebai/order.go
View File

@@ -291,6 +291,12 @@ func (p *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *mo
if order.StoreID > math.MaxInt32 {
order.StoreID = 0
}
sendFeeDetail := utils.MustInterface2Int64(orderMap["send_fee_detail"].(map[string]interface{})["one_on_one_delivery_fee"])
if sendFeeDetail > 0 {
order.CouponIDs += ",11003"
}
order.Status = p.getStatusFromVendorStatus(order.VendorStatus)
if order.Status >= model.OrderStatusEndBegin {
order.OrderFinishedAt = time.Now()

4
business/partner/purchase/mtwm/order.go
View File

@@ -322,7 +322,9 @@ func (p *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *mo
tagList := utils.Interface2Int64List(orderData["order_tag_list"].([]interface{}))
tagListStr := make([]string, len(tagList), len(tagList))
for _, v := range tagList {
tagListStr = append(tagListStr, utils.Int64ToStr(v))
if v == 11003 || v == 11002 { // 主单模式1v1急送订单
tagListStr = append(tagListStr, utils.Int64ToStr(v))
}
}
order.CouponIDs = strings.Join(tagListStr, ",")
}