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-02-02 17:20:20 +08:00
parent f51dbcd50a f032189688
commit 16a8b666c8
3 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,7 +48,6 @@ func (s *DefScheduler) SelfDeliveringAndUpdateStatus(ctx *jxcontext.Context, ven
} else { } else {
if order.Status < model.OrderStatusDelivering { if order.Status < model.OrderStatusDelivering {
err = s.Swtich2SelfDeliver(order, userName) err = s.Swtich2SelfDeliver(order, userName)
globals.SugarLogger.Debugf("====================err %v", err)
} else if order.VendorID == order.WaybillVendorID { // 状态为配送中，且是购物平台运单，不能转自送了 } else if order.VendorID == order.WaybillVendorID { // 状态为配送中，且是购物平台运单，不能转自送了
err = scheduler.ErrOrderStatusIsNotSuitable4CurOperation err = scheduler.ErrOrderStatusIsNotSuitable4CurOperation
} }

8
business/partner/delivery/rider.go
View File

@@ -220,7 +220,6 @@ func UpdateFakeWayBillToTiktok() {
} }
fakeWayBill, err := dao.GetWayBillFakeOrder() fakeWayBill, err := dao.GetWayBillFakeOrder()
//globals.SugarLogger.Debugf("fakeWayBill======= %s", utils.Format4Output(fakeWayBill, false))
if err != nil { if err != nil {
globals.SugarLogger.Debugf("Get Fake Order Err : %s", err.Error()) globals.SugarLogger.Debugf("Get Fake Order Err : %s", err.Error())
return return
@@ -306,14 +305,15 @@ func UpdateFakeWayBillToTiktok() {
randTime += 60 randTime += 60
} }
fakeWayBill[i].StatusTime = time.Now().Add(time.Duration(randTime) * time.Second).Local() fakeWayBill[i].StatusTime = time.Now().Add(time.Duration(randTime) * time.Second).Local()
fakeWayBill[i].WaybillFinishedAt = time.Now()
// 更新假运单 // 更新假运单
if _, err := dao.UpdateEntity(dao.GetDB(), fakeWayBill[i], "Status", "VendorStatus", "StatusTime"); err != nil { if _, err := dao.UpdateEntity(dao.GetDB(), fakeWayBill[i], "Status", "VendorStatus", "StatusTime", "WaybillFinishedAt"); err != nil {
globals.SugarLogger.Errorf("Update Fake Way Bill Err:%s--%s--%v", riderInfo.OrderId, riderInfo.ThirdCarrierOrderId, err) globals.SugarLogger.Errorf("Update Fake Way Bill Err:%s--%s--%v", riderInfo.OrderId, riderInfo.ThirdCarrierOrderId, err)
} }
// 更新运单为完成状态 // 更新运单为完成状态
if fakeWayBill[i].Status == model.WaybillStatusDelivered { if fakeWayBill[i].Status == model.WaybillStatusDelivered {
sql := `UPDATE goods_order g SET g.status = ?,g.vendor_status = ? WHERE g.vendor_order_id = ? ` sql := `UPDATE goods_order g SET g.status = ?,g.vendor_status = ?,g.order_finished_at = ? WHERE g.vendor_order_id = ? `
_, err := dao.ExecuteSQL(dao.GetDB(), sql, []interface{}{model.OrderStatusFinished, model.OrderStatusFinished, fakeWayBill[i].VendorOrderID}...) _, err := dao.ExecuteSQL(dao.GetDB(), sql, []interface{}{model.OrderStatusFinished, model.OrderStatusFinished, time.Now(), fakeWayBill[i].VendorOrderID}...)
if err != nil { if err != nil {
globals.SugarLogger.Debugf("UPDATA goods_order Err :%s", err.Error()) globals.SugarLogger.Debugf("UPDATA goods_order Err :%s", err.Error())
} }

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

@@ -113,7 +113,17 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode, vendorOrderID, vendorStoreID s
order.OrderFinishedAt = utils.DefaultTimeValue order.OrderFinishedAt = utils.DefaultTimeValue
} }
//order.DeliveryType = model.OrderDeliveryTypeStoreSelf //order.DeliveryType = model.OrderDeliveryTypeStoreSelf
order.DeliveryType = model.OrderDeliveryTypePlatform autoTransport, err := GetStoreAutoCallRiderInfo(vendorOrgCode, []int64{utils.Str2Int64(vendorStoreID)})
if err != nil || len(autoTransport) == 0 {
order.DeliveryType = model.OrderDeliveryTypePlatform
} else {
switch autoTransport[utils.Str2Int64(vendorStoreID)].ServiceStatus {
case 1: // 1：关闭
order.DeliveryType = model.OrderDeliveryTypeStoreSelf
case 2: // 开启
order.DeliveryType = model.OrderDeliveryTypePlatform
}
}
order.Status = p.getStatusFromVendorStatus(result.OrderStatus) order.Status = p.getStatusFromVendorStatus(result.OrderStatus)
if result.UserIdInfo != nil { if result.UserIdInfo != nil {