diff --git a/business/partner/delivery/rider.go b/business/partner/delivery/rider.go index 12459cfa0..d537ea46c 100644 --- a/business/partner/delivery/rider.go +++ b/business/partner/delivery/rider.go @@ -523,6 +523,9 @@ func UpdateFakeWayBillToTiktok() { if randTime < 300 { randTime += 300 } + if fakeWayBill[i].Status < model.WaybillStatusDelivering { + randTime = 120 + } if fakeWayBill[i].Status == model.WaybillStatusDelivered && order.ExpectedDeliveredTime.Unix()-time.Now().Unix() <= 120 { fakeWayBill[i].StatusTime = time.Now() @@ -534,6 +537,7 @@ func UpdateFakeWayBillToTiktok() { 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) } + // 更新运单为完成状态 if fakeWayBill[i].Status == model.WaybillStatusDelivered { sql := `UPDATE goods_order g SET g.status = ?,g.vendor_status = ?,g.order_finished_at = ? WHERE g.vendor_order_id = ? ` diff --git a/business/partner/im/im.go b/business/partner/im/im.go index ab1aa94f9..264eb7677 100644 --- a/business/partner/im/im.go +++ b/business/partner/im/im.go @@ -548,11 +548,6 @@ func CheckAndReply(req *JXMsg, elmAppID string) (err error) { VendorID: VendorIDMTStr, UserID: utils.Int2Str(mt.OpenUserID), } - if mt.OpenUserID == 12832526786 || keyDetailMt.VendorStoreID == "18026738" { - globals.SugarLogger.Debugf("===keyDetailMt := %s", utils.Format4Output(mt, false)) - globals.SugarLogger.Debugf("===JXMsg := %s", utils.Format4Output(&req, false)) - globals.SugarLogger.Debugf("===keyDetailMt := %s", utils.Format4Output(keyDetailMt, false)) - } //1 检测是否已自动回复 flag = GetIfReply(key, keyDetailMt) //判断flag状态 @@ -856,9 +851,6 @@ func GetIfReply(key string, keyDetail UserRelInfo) (flag bool) { flag = false if n, err := rdb.Exists(key); n > 0 && err == nil { str := rdb.LRange(key) - if keyDetail.VendorStoreID == "18026738" { - globals.SugarLogger.Debugf("=======str ;= %s", utils.Format4Output(str, false)) - } for i := 0; i < len(str); i++ { v := AutoReply{} if err = json.Unmarshal([]byte(str[i]), &v); err == nil { @@ -871,10 +863,6 @@ func GetIfReply(key string, keyDetail UserRelInfo) (flag bool) { var param []UserRelInfo temp := append(param, keyDetail) detail, err := GetImChatDetail(temp) - if keyDetail.VendorStoreID == "18026738" { - globals.SugarLogger.Debugf("=======detail ;= %s", utils.Format4Output(detail, false)) - globals.SugarLogger.Debugf("=======err ;= %v", err) - } if err == nil && detail != nil { tKey := keyDetail.AppID + ":" + keyDetail.VendorStoreID + ":" + keyDetail.VendorID + ":" + keyDetail.UserID if detail[tKey] != nil { diff --git a/controllers/jx_order.go b/controllers/jx_order.go index 9620bdbe3..66c66970e 100644 --- a/controllers/jx_order.go +++ b/controllers/jx_order.go @@ -80,6 +80,13 @@ func (c *OrderController) SelfDelivering() { // @router /SelfDelivered [post] func (c *OrderController) SelfDelivered() { c.callSelfDelivered(func(params *tOrderSelfDeliveredParams) (retVal interface{}, errCode string, err error) { + bills, _ := dao.GetWaybills(dao.GetDB(), params.VendorOrderID, nil) + for _, b := range bills { + if b.WaybillVendorID == model.VendorJXFakeWL && b.Status < model.OrderStatusDelivering { + return nil, "", fmt.Errorf("物流单正在同步回传率,请稍后再点击送达") + } + } + err = defsch.FixedScheduler.SelfDeliveredAndUpdateStatus(params.Ctx, params.VendorOrderID, params.VendorID, params.Ctx.GetUserName()) return nil, "", err })