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-09-27 10:54:40 +08:00
parent 3d1cb2ef2b 98f7ffb213
commit 28f84c6f7d
4 changed files with 20 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
business/jxcallback/orderman/order.go
View File

@@ -2702,12 +2702,11 @@ func UpdateTiktokShopTotalMoney() {
func UpdateTaoSettleInfo() {
db := dao.GetDB()
var count = 0
globals.SugarLogger.Debugf("======================UpdateTaoSettleInfo")
timeStart := time.Now().Add(-24 * 20 * time.Hour)
timeStart := time.Now().Add(-24 * 4 * time.Hour)
startTime := time.Date(timeStart.Year(), timeStart.Month(), timeStart.Day(), 0, 0, 0, 0, timeStart.Location())
timeEnd := time.Now()
timeEnd := time.Now().Add(-24 * 1 * time.Hour)
endTime := time.Date(timeEnd.Year(), timeEnd.Month(), timeEnd.Day()-1, 23, 59, 59, 0, timeStart.Location())
storeMaps, err := dao.GetTaoOrderVendor(db, startTime, endTime)
@@ -2716,8 +2715,8 @@ func UpdateTaoSettleInfo() {
}
for k, v := range storeMaps {
globals.SugarLogger.Debugf("门店id : %s", k)
count++
globals.SugarLogger.Debugf("========storeID := %s", k)
settleInfo, err := tao.GetOrderTotalShopMoney(v, k, startTime, endTime)
if err != nil {
globals.SugarLogger.Errorf("获取淘鲜达结算信息异常 := %v", err)
@@ -2754,5 +2753,5 @@ func UpdateTaoSettleInfo() {
}
}
}
globals.SugarLogger.Debug("========count := %d", count)
globals.SugarLogger.Debugf("========count := %d", count)
}

30
business/jxcallback/scheduler/basesch/basesch.go
View File

@@ -142,26 +142,22 @@ func (c *BaseScheduler) SelfDeliverDelivering(order *model.GoodsOrder, userName
localBill, _ := partner.CurOrderManager.LoadWaybill(order.VendorWaybillID, order.WaybillVendorID)
// 获取抖音配送状态
tiktokWayBillStatus, _ := partner.GetPurchasePlatformFromVendorID(order.VendorID).OrderLogisticsStatus(order.VendorOrderID)
if tiktokWayBillStatus != nil {
if tiktokWayBillStatus.LogisticsStatus >= tiktokShop.ShipmentStatusReceived {
//取消抖音配送转自送
err = c.CancelWaybill(localBill, partner.CancelWaybillReasonDYPSCancel, partner.CancelWaybillReasonStrDYPSCancel)
partner.CurOrderManager.OnOrderMsg(order, "取消抖音配送,转用门店自配送/三方配送", "抖音骑手已经接单,无法取消")
if tiktokWayBillStatus != nil && tiktokWayBillStatus.LogisticsStatus >= tiktokShop.ShipmentStatusReceived {
//取消抖音配送转自送
err = c.CancelWaybill(localBill, partner.CancelWaybillReasonDYPSCancel, partner.CancelWaybillReasonStrDYPSCancel+"抖音骑手已经接单,无法取消")
partner.CurOrderManager.OnOrderMsg(order, "取消抖音配送,转用门店自配送/三方配送", "抖音骑手已经接单,无法取消")
return err
} else if tiktokWayBillStatus != nil && tiktokWayBillStatus.LogisticsStatus == -1 { // 先转自送,自送不成功取消平台配送.
if err := partner.GetPurchaseOrderHandlerFromVendorID(order.VendorID).SelfDeliverDelivering(order, userName); err != nil {
partner.CurOrderManager.OnOrderMsg(order, "抖音转自送,平台无运力", "tiktokWayBillStatus = -1")
}
} else if err = partner.GetPurchasePlatformFromVendorID(order.VendorID).CancelLogisticsByWmOrderId(order, "", "", order.VendorStoreID, order.VendorOrderID); err != nil {
if err = c.CancelWaybill(localBill, partner.CancelWaybillReasonDYPSCancel, partner.CancelWaybillReasonStrDYPSCancel); err != nil {
partner.CurOrderManager.OnOrderMsg(order, "取消抖音平台运单错误,无法转自送", err.Error())
return err
} else if tiktokWayBillStatus.LogisticsStatus == -1 { // 先转自送,自送不成功取消平台配送.
if err := partner.GetPurchaseOrderHandlerFromVendorID(order.VendorID).SelfDeliverDelivering(order, userName); err != nil {
partner.CurOrderManager.OnOrderMsg(order, "抖音转自送,平台无运力", "tiktokWayBillStatus = -1")
}
}
} else {
if err = partner.GetPurchasePlatformFromVendorID(order.VendorID).CancelLogisticsByWmOrderId(order, "", "", order.VendorStoreID, order.VendorOrderID); err != nil {
if err = c.CancelWaybill(localBill, partner.CancelWaybillReasonDYPSCancel, partner.CancelWaybillReasonStrDYPSCancel); err != nil {
partner.CurOrderManager.OnOrderMsg(order, "取消抖音平台运单错误,无法转自送", err.Error())
return err
}
} else {
partner.GetPurchasePlatformFromVendorID(order.VendorID).SelfDeliverDelivering(order, "")
}
partner.GetPurchasePlatformFromVendorID(order.VendorID).SelfDeliverDelivering(order, "")
}
} else {
if err := partner.GetPurchaseOrderHandlerFromVendorID(order.VendorID).SelfDeliverDelivering(order, userName); err != nil && (err != scheduler.ErrOrderStatusAlreadySatisfyCurOperation) {

2
business/jxstore/misc/misc.go
View File

@@ -201,7 +201,7 @@ func Init() {
orderman.UpdateTaoSettleInfo()
}, []string{
"06:30:00",
"18:07:00",
"22:47:00",
})
// 每分钟轮询一次,推送骑手信息(假的订单)

4
business/model/dao/dao_order.go
View File

@@ -257,9 +257,9 @@ func ClearOrderFlag2(db *DaoDB, userName string, vendorOrderID string, vendorID
func SetAfsOrderFlag(db *DaoDB, userName string, afsOrderID string, vendorID int, flag int) (err error) {
_, err = ExecuteSQL(db, `
UPDATE afs_order
SET flag = flag | ?
SET flag = flag | ?,last_operator = ?
WHERE afs_order_id = ? AND vendor_id = ?
`, flag, afsOrderID, vendorID)
`, flag, userName, afsOrderID, vendorID)
return err
}