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

1

Browse Source
This commit is contained in:
邹宗楠
2024-08-20 11:44:50 +08:00
parent 99ef639a57
commit fc20a9e789
3 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -523,6 +523,9 @@ func UpdateFakeWayBillToTiktok() {
if randTime < 300 { if randTime < 300 {
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 { if fakeWayBill[i].Status == model.WaybillStatusDelivered && order.ExpectedDeliveredTime.Unix()-time.Now().Unix() <= 120 {
fakeWayBill[i].StatusTime = time.Now() 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 { 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 = ?,g.order_finished_at = ? 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 = ? `

12
business/partner/im/im.go
View File

@@ -548,11 +548,6 @@ func CheckAndReply(req *JXMsg, elmAppID string) (err error) {
VendorID: VendorIDMTStr, VendorID: VendorIDMTStr,
UserID: utils.Int2Str(mt.OpenUserID), 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 检测是否已自动回复 //1 检测是否已自动回复
flag = GetIfReply(key, keyDetailMt) flag = GetIfReply(key, keyDetailMt)
//判断flag状态 //判断flag状态
@@ -856,9 +851,6 @@ func GetIfReply(key string, keyDetail UserRelInfo) (flag bool) {
flag = false flag = false
if n, err := rdb.Exists(key); n > 0 && err == nil { if n, err := rdb.Exists(key); n > 0 && err == nil {
str := rdb.LRange(key) str := rdb.LRange(key)
if keyDetail.VendorStoreID == "18026738" {
globals.SugarLogger.Debugf("=======str ;= %s", utils.Format4Output(str, false))
}
for i := 0; i < len(str); i++ { for i := 0; i < len(str); i++ {
v := AutoReply{} v := AutoReply{}
if err = json.Unmarshal([]byte(str[i]), &v); err == nil { 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 var param []UserRelInfo
temp := append(param, keyDetail) temp := append(param, keyDetail)
detail, err := GetImChatDetail(temp) 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 { if err == nil && detail != nil {
tKey := keyDetail.AppID + ":" + keyDetail.VendorStoreID + ":" + keyDetail.VendorID + ":" + keyDetail.UserID tKey := keyDetail.AppID + ":" + keyDetail.VendorStoreID + ":" + keyDetail.VendorID + ":" + keyDetail.UserID
if detail[tKey] != nil { if detail[tKey] != nil {

7
controllers/jx_order.go
View File

@@ -80,6 +80,13 @@ func (c *OrderController) SelfDelivering() {
// @router /SelfDelivered [post] // @router /SelfDelivered [post]
func (c *OrderController) SelfDelivered() { func (c *OrderController) SelfDelivered() {
c.callSelfDelivered(func(params *tOrderSelfDeliveredParams) (retVal interface{}, errCode string, err error) { 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()) err = defsch.FixedScheduler.SelfDeliveredAndUpdateStatus(params.Ctx, params.VendorOrderID, params.VendorID, params.Ctx.GetUserName())
return nil, "", err return nil, "", err
}) })