1
This commit is contained in:
@@ -223,7 +223,6 @@ func (c *BaseScheduler) CreateWaybill(platformVendorID int, order *model.GoodsOr
|
|||||||
if c.IsReallyCallPlatformAPI {
|
if c.IsReallyCallPlatformAPI {
|
||||||
// 美团配送订单生成,配送费计算
|
// 美团配送订单生成,配送费计算
|
||||||
bill, err = handlerInfo.Handler.CreateWaybill(order, maxDeliveryFee)
|
bill, err = handlerInfo.Handler.CreateWaybill(order, maxDeliveryFee)
|
||||||
globals.SugarLogger.Debugf("====================bill %s", utils.Format4Output(bill, false))
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
globals.SugarLogger.Infof("CreateWaybill failed orderID:%s vendorID:%d with error:%v", order.VendorOrderID, platformVendorID, err)
|
globals.SugarLogger.Infof("CreateWaybill failed orderID:%s vendorID:%d with error:%v", order.VendorOrderID, platformVendorID, err)
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -53,8 +53,6 @@ func (c *BaseScheduler) CreateWaybillOnProviders(ctx *jxcontext.Context, order *
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
globals.SugarLogger.Debugf("===========bills 11 %s ", utils.Format4Output(bills, false))
|
|
||||||
globals.SugarLogger.Debugf("===========bills 11 %s ", utils.Format4Output(errList.GetErrListAsOne(), false))
|
|
||||||
if len(bills) > 0 {
|
if len(bills) > 0 {
|
||||||
err = errList.GetErrListAsOne()
|
err = errList.GetErrListAsOne()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
@@ -262,7 +262,6 @@ func (v *VendorSync) SyncStore2(ctx *jxcontext.Context, db *dao.DaoDB, vendorIDs
|
|||||||
failedList = putils.GetErrMsg2FailedSingleList(nil, err, storeMap.StoreID, model.VendorChineseNames[storeMap.VendorID], "删除门店")
|
failedList = putils.GetErrMsg2FailedSingleList(nil, err, storeMap.StoreID, model.VendorChineseNames[storeMap.VendorID], "删除门店")
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
globals.SugarLogger.Debugf("3.UpdateStore")
|
|
||||||
if err = handler.UpdateStore(db2, storeMap.StoreID, userName); err == nil {
|
if err = handler.UpdateStore(db2, storeMap.StoreID, userName); err == nil {
|
||||||
resultList = append(resultList, 1)
|
resultList = append(resultList, 1)
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -151,7 +151,6 @@ func GetOrderRiderInfoToPlatform(orderId string, wayBillStatus int) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func PullTiktokRiderInfo(riderInfo *mtpsapi.RiderInfo) {
|
func PullTiktokRiderInfo(riderInfo *mtpsapi.RiderInfo) {
|
||||||
globals.SugarLogger.Debugf("==================riderInfo:%s", utils.Format4Output(riderInfo, false))
|
|
||||||
switch riderInfo.LogisticsStatus {
|
switch riderInfo.LogisticsStatus {
|
||||||
case 5: // 呼叫骑手
|
case 5: // 呼叫骑手
|
||||||
riderInfo.LogisticsStatus = 0
|
riderInfo.LogisticsStatus = 0
|
||||||
|
|||||||
@@ -33,7 +33,6 @@ var (
|
|||||||
)
|
)
|
||||||
|
|
||||||
func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*dao.StoreSkuSyncInfo) (failedList []*partner.StoreSkuInfoWithErr, err error) {
|
func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*dao.StoreSkuSyncInfo) (failedList []*partner.StoreSkuInfoWithErr, err error) {
|
||||||
globals.SugarLogger.Debugf("是不是正儿八经的京东商城%s", "CreateStoreSkus")
|
|
||||||
if globals.EnableJdShopWrite {
|
if globals.EnableJdShopWrite {
|
||||||
if vendorStoreID == model.JdShopMainVendorStoreID {
|
if vendorStoreID == model.JdShopMainVendorStoreID {
|
||||||
for _, v := range storeSkuList {
|
for _, v := range storeSkuList {
|
||||||
@@ -44,8 +43,6 @@ func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, v
|
|||||||
//flag2 := false
|
//flag2 := false
|
||||||
//var wareStatusUpdateWareID string
|
//var wareStatusUpdateWareID string
|
||||||
result, err := getAPI(v.VendorOrgCode).SearchWare4Valid(name, 1, 100) // 搜索有效商品
|
result, err := getAPI(v.VendorOrgCode).SearchWare4Valid(name, 1, 100) // 搜索有效商品
|
||||||
globals.SugarLogger.Debugf("========result %s", utils.Format4Output(result, false))
|
|
||||||
globals.SugarLogger.Debugf("========result %s", err)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "创建商品")
|
failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "创建商品")
|
||||||
return failedList, err
|
return failedList, err
|
||||||
@@ -463,7 +460,6 @@ func (p *PurchaseHandler) UpdateStoreSkus(ctx *jxcontext.Context, storeID int, v
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (p *PurchaseHandler) DeleteStoreSkus(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*partner.StoreSkuInfo) (failedList []*partner.StoreSkuInfoWithErr, err error) {
|
func (p *PurchaseHandler) DeleteStoreSkus(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*partner.StoreSkuInfo) (failedList []*partner.StoreSkuInfoWithErr, err error) {
|
||||||
globals.SugarLogger.Debugf("是不是正儿八经的京东商城%s", "DeleteStoreSkus")
|
|
||||||
if globals.EnableJdShopWrite && vendorStoreID == model.JdShopMainVendorStoreID {
|
if globals.EnableJdShopWrite && vendorStoreID == model.JdShopMainVendorStoreID {
|
||||||
for _, v := range storeSkuList {
|
for _, v := range storeSkuList {
|
||||||
if v.IsDeletedBySku {
|
if v.IsDeletedBySku {
|
||||||
|
|||||||
@@ -197,7 +197,6 @@ func (p *PurchaseHandler) DeleteStoreCategory(ctx *jxcontext.Context, storeID in
|
|||||||
|
|
||||||
//批量更新商品进货价
|
//批量更新商品进货价
|
||||||
func BatchSetRestockingPrice(ctx *jxcontext.Context, storeID int, vendorStoreID string, param []*mtwmapi.SpuData) error {
|
func BatchSetRestockingPrice(ctx *jxcontext.Context, storeID int, vendorStoreID string, param []*mtwmapi.SpuData) error {
|
||||||
globals.SugarLogger.Debugf("test getStoreVendorOrgCode(storeID)==========%s", getStoreVendorOrgCode(storeID))
|
|
||||||
if err := getAPI(getStoreVendorOrgCode(storeID), storeID, "").BatchSetRestockingPrice(ctx.GetTrackInfo(), vendorStoreID, param); err != nil {
|
if err := getAPI(getStoreVendorOrgCode(storeID), storeID, "").BatchSetRestockingPrice(ctx.GetTrackInfo(), vendorStoreID, param); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user