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:
邹宗楠
2023-11-20 09:37:02 +08:00
parent 382c45297a
commit 92ed3708b4
3 changed files with 52 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1121,19 +1121,20 @@ func UpdateSkuName(ctx *jxcontext.Context, nameID int, payload map[string]interf
dao.Rollback(db, txDB) dao.Rollback(db, txDB)
return 0, err return 0, err
} }
// if valid["jdsStockSwitch"] != nil {
// if _, err = SetStoreSkuSyncStatus2(db, []int{model.JdShopMainStoreID}, []int{model.VendorIDJDShop}, skuIDs, model.SyncFlagSaleMask); err != nil {
// dao.Rollback(db, txDB)
// return 0, err
// }
// }
} }
dao.Commit(db, txDB) dao.Commit(db, txDB)
errList := errlist.New() errList := errlist.New()
errList.AddErr(err) errList.AddErr(err)
_, err = CurVendorSync.SyncSku(ctx, db, nameID, -1, false, false, userName) //_, err = CurVendorSync.SyncSku(ctx, db, nameID, -1, false, false, userName)
errList.AddErr(err) //errList.AddErr(err)
storeIds, err := GetSyncSkuStoreId(db, skuIDs)
if err != nil {
return 0, err
}
_, err2 = CurVendorSync.SyncStoresSkus(jxcontext.AdminCtx, nil, 0, db, partner.GetSingleStoreVendorIDs(), storeIds, skuIDs, false, false, true)
errList.AddErr(err2)
err = errList.GetErrListAsOne() err = errList.GetErrListAsOne()
if globals.IsAddEvent { if globals.IsAddEvent {
mapBefore := refutil.FindMapAndStructMixed(valid, beforSkuName) mapBefore := refutil.FindMapAndStructMixed(valid, beforSkuName)
@@ -1410,6 +1411,26 @@ func SetUpdateSkuPriceIfChange(db *dao.DaoDB, skuPrice, nowPrice int64, skuId in
return err return err
} }
// GetSyncSkuStoreId 当每个商品存在修改时,需要重新同步商品的信息,立马同步,获取需要同步的门店信息
func GetSyncSkuStoreId(db *dao.DaoDB, skus []int) ([]int, error) {
sql := ` SELECT * FROM store_sku_bind b
INNER JOIN store s on s.id = b.store_id
WHERE b.sku_id IN (` + dao.GenQuestionMarks(len(skus)) + `) AND b.status = ? AND s.status <> ? AND b.deleted_at = ? `
param := []interface{}{skus, model.YES, model.StoreStatusDisabled, utils.DefaultTimeValue}
skuBind := make([]*model.StoreSkuBind, 0, 0)
if err := dao.GetRows(db, &skuBind, sql, param); err != nil {
return nil, err
}
storeIds := make([]int, 0, 0)
for _, v := range skuBind {
storeIds = append(storeIds, v.StoreID)
}
return storeIds, nil
}
func UpdateSkuImg(ctx *jxcontext.Context, skuID int, payload map[string]interface{}) (string, error) { func UpdateSkuImg(ctx *jxcontext.Context, skuID int, payload map[string]interface{}) (string, error) {
var ( var (
db = dao.GetDB() db = dao.GetDB()

3
business/partner/purchase/jd/order.go
View File

@@ -351,8 +351,9 @@ func Map2Order(orderData map[string]interface{}) (order *model.GoodsOrder) {
order.Skus = append(order.Skus, sku) order.Skus = append(order.Skus, sku)
} }
// 包装袋金额设置 // 包装袋金额设置
store, _ := dao.GetStoreDetail(dao.GetDB(), order.JxStoreID, order.VendorID, order.VendorOrgCode) store, _ := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), order.VendorStoreID, order.VendorID, order.VendorOrgCode)
order.PackagePrice = store.PackageSetting order.PackagePrice = store.PackageSetting
order.JxStoreID = store.ID
jxutils.RefreshOrderSkuRelated(order) jxutils.RefreshOrderSkuRelated(order)
return order return order
} }

27
business/partner/purchase/tiktok_store/order.go
View File

@@ -587,20 +587,35 @@ func (c *PurchaseHandler) Swtich2SelfDeliver(order *model.GoodsOrder, userName s
} }
} }
} }
logisticsAdd := &order_logisticsAdd_request.OrderLogisticsAddParam{
//转门店自送通知抖音发货
err = api.OrderDelivering(&order_logisticsAdd_request.OrderLogisticsAddParam{
OrderId: order.VendorOrderID, OrderId: order.VendorOrderID,
Company: "", Company: "",
CompanyCode: "chengdouruoxi", CompanyCode: "",
LogisticsCode: order.VendorOrderID, LogisticsCode: order.VendorOrderID,
IsRefundReject: false, IsRefundReject: false,
IsRejectRefund: false, IsRejectRefund: false,
SerialNumberList: nil, SerialNumberList: nil,
AddressId: 0, AddressId: 0,
StoreId: utils.Str2Int64(order.VendorStoreID), StoreId: utils.Str2Int64(order.VendorStoreID),
}) }
return err switch order.WaybillVendorID {
case model.VendorIDDada:
logisticsAdd.CompanyCode = tiktokShop.TiktokDeliveryTypeDaDa
case model.VendorIDMTPS:
logisticsAdd.CompanyCode = tiktokShop.TiktokDeliveryTypeMeiTuan
case model.VendorIDFengNiao:
logisticsAdd.CompanyCode = tiktokShop.TiktokDeliveryTypeFengNiao
case model.VendorIDSFPS:
logisticsAdd.CompanyCode = tiktokShop.TiktokDeliveryTypeSF
case model.VendorIDUUPT:
logisticsAdd.CompanyCode = tiktokShop.TiktokDeliveryTypeUU
case model.VendorJXFakeWL, -1:
logisticsAdd.CompanyCode = tiktokShop.TiktokDeliveryTypeMerchant
default:
logisticsAdd.CompanyCode = tiktokShop.TiktokDeliveryTypeMerchant
}
//转门店自送通知抖音发货
return api.OrderDelivering(logisticsAdd)
} }
// Swtich2SelfDelivered 暂无自送完成 // Swtich2SelfDelivered 暂无自送完成