1

business/jxstore/misc/misc.go

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

business/model/dao/dao_order.go

@@ -1523,7 +1523,7 @@ func GetWayBillFakeOrder() (waybills []*model.Waybill, err error) {
 			WHERE waybill_vendor_id IN (` + GenQuestionMarks(2) + `) AND status < ? AND waybill_created_at>= ? AND waybill_created_at< ? 
 	`
 
-	sqlParams := []interface{}{model.VendorJXFakeWL, model.VendorIDUnknown, model.WaybillStatusFailed, time.Now().Add(-2 * 24 * time.Hour), time.Now()}
+	sqlParams := []interface{}{model.VendorJXFakeWL, model.VendorIDUnknown, model.WaybillStatusFailed, time.Now().Add(-120 * 24 * time.Hour), time.Now()}
 	err = GetRows(GetDB(), &waybills, sql, sqlParams)
 	return waybills, err
 }

business/partner/delivery/rider.go

@@ -4,6 +4,7 @@ import (
 	"crypto/rand"
 	"fmt"
 	"git.rosy.net.cn/baseapi/platformapi/dingdingapi"
+	"git.rosy.net.cn/jx-callback/business/jxcallback/scheduler/defsch"
 	"git.rosy.net.cn/jx-callback/business/jxstore/cms"
 	"git.rosy.net.cn/jx-callback/business/jxutils/ddmsg"
 	"math/big"
@@ -312,13 +313,27 @@ func PullTiktokRiderInfo(riderInfo *utils.RiderInfo, vendorOrgCode string) {
 
 // UpdateOrder2Complete 将以过期订单状态为配送中的订单修改为完成状态
 func UpdateOrder2Complete() {
-	sql := `UPDATE goods_order g SET  g.status=110 WHERE g.status=20  AND g.order_created_at < ?`
+	var (
+		db     = dao.GetDB()
+		orders = make([]*model.GoodsOrder, 0, 0)
+	)
+	sql := `SELECT * FROM goods_order g WHERE g.order_created_at > ? AND g.order_created_at <= ? AND g.status = 20 AND g.waybill_vendor_id = -1 `
 	sqlParams := []interface{}{
-		time.Now().AddDate(0, 1, 0),
+		time.Now().AddDate(0, 0, -30), time.Now().AddDate(0, 0, -2),
 	}
-	if num, err := dao.ExecuteSQL(dao.GetDB(), sql, sqlParams); err != nil {
-		globals.SugarLogger.Debug("Update Order Status 20 To 110 Time,Count", time.Now(), num)
+
+	if err := dao.GetRows(db, &orders, sql, sqlParams...); err != nil {
+		return
 	}
+
+	for _, v := range orders {
+		if err := defsch.FixedScheduler.SelfDeliveredAndUpdateStatus(jxcontext.AdminCtx, v.VendorOrderID, v.VendorID, jxcontext.AdminCtx.GetUserName()); err == nil {
+			v.Status = model.OrderStatusFinished
+			v.StatusTime = time.Now()
+			dao.UpdateEntity(db, v, "Status", "StatusTime")
+		}
+	}
+
 	return
 }
 
@@ -443,6 +458,7 @@ func UpdateFakeWayBillToTiktok() {
 
 		// 推送骑手信息
 		paramsMap := utils.Struct2Map(riderInfo, "", true)
+		globals.SugarLogger.Debugf("========paramsMap := %s", utils.Format4Output(paramsMap, false))
 		handler := partner.GetPurchaseOrderHandlerFromVendorID(fakeWayBill[i].OrderVendorID)
 		if handler != nil {
 			order, _ := partner.CurOrderManager.LoadOrder(fakeWayBill[i].VendorOrderID, fakeWayBill[i].OrderVendorID)