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

Merge branch 'jdshop' of https://e.coding.net/rosydev/jx-callback into jdshop

Browse Source
This commit is contained in:
richboo111
2023-03-10 14:12:02 +08:00
parent 7303bf3571 248bc2ce8a
commit 3bc83381f3
3 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
business/jxcallback/auto_delivery/auto_delivery.go
View File

@@ -132,11 +132,13 @@ func AutoSettingFakeDelivery() {
}
// 自动拣货
handler := partner.GetPurchaseOrderHandlerFromVendorID(v.VendorID)
flag := model.IsOrderDeliveryByStore(v) || model.IsOrderDeliveryBySelf(v)
if err := handler.PickupGoods(v, flag, jxcontext.AdminCtx.GetUserName()); err != nil {
globals.SugarLogger.Errorf("自动拣货错误:[%v]", err)
break
if v.Status < model.OrderStatusFinishedPickup { // 未拣货
handler := partner.GetPurchaseOrderHandlerFromVendorID(v.VendorID)
flag := model.IsOrderDeliveryByStore(v) || model.IsOrderDeliveryBySelf(v)
if err := handler.PickupGoods(v, flag, jxcontext.AdminCtx.GetUserName()); err != nil {
globals.SugarLogger.Errorf("自动拣货错误:[%v]", err)
break
}
}
//自动发单
if len(riderListInfo[riderKey]) == 0 {

5
business/jxcallback/scheduler/defsch/defsch_ext.go
View File

@@ -129,6 +129,11 @@ func (s *DefScheduler) canOrderCreateWaybillNormally(order *model.GoodsOrder, sa
}
func (s *DefScheduler) isPossibleSwitch2SelfDelivery(order *model.GoodsOrder) (err error) {
//TODO 刷单用,之后不刷单了删除
if order.VendorID == model.VendorIDDD {
return nil
}
if model.IsOrderDeliveryByPlatform(order) {
if order.Status < model.OrderStatusFinishedPickup {
err = fmt.Errorf("拣货完成后才能转自配送")

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

@@ -474,8 +474,6 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
} else {
skus, err = dao.GetStoreSkus(db, vendorID, storeID, skuIDs)
}
globals.SugarLogger.Debugf("======sku:= %s", utils.Format4Output(skus, false))
if err != nil || len(skus) == 0 {
return err
}
@@ -699,18 +697,6 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
// }
}
if storeID == 668815 {
globals.SugarLogger.Debugf("======createList:= %s", utils.Format4Output(createList, false))
globals.SugarLogger.Debugf("======updateList:= %s", utils.Format4Output(updateList, false))
globals.SugarLogger.Debugf("======deleteList:= %s", utils.Format4Output(deleteList, false))
globals.SugarLogger.Debugf("======stockList:= %s", utils.Format4Output(stockList, false))
globals.SugarLogger.Debugf("======onlineList:= %s", utils.Format4Output(onlineList, false))
globals.SugarLogger.Debugf("======offlineList:= %s", utils.Format4Output(offlineList, false))
globals.SugarLogger.Debugf("======priceList:= %s", utils.Format4Output(priceList, false))
globals.SugarLogger.Debugf("======updateItems:= %s", utils.Format4Output(updateItems, false))
globals.SugarLogger.Debugf("======reorderSkuMap:= %s", utils.Format4Output(reorderSkuMap, false))
}
task := tasksch.NewParallelTask("syncStoreSkuNew", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError2), ctx,
func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
step := batchItemList[0].(int)