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-10-16 14:40:00 +08:00
parent a74b5baaac fc92769523
commit fbb2ec01c6
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
business/jxcallback/orderman/order_comment.go
View File

@@ -2,8 +2,6 @@ package orderman
import ( import (
"encoding/json" "encoding/json"
"git.rosy.net.cn/baseapi/platformapi/dingdingapi"
"git.rosy.net.cn/jx-callback/business/jxutils/ddmsg"
"math/rand" "math/rand"
"time" "time"
@@ -84,9 +82,6 @@ func (c *OrderManager) OnOrderComments(orderCommentList []*model.OrderComment) (
if dao.IsNoRowsError(err) { if dao.IsNoRowsError(err) {
err = nil err = nil
isNewComment = true isNewComment = true
if orderComment.StoreID == 669247 {
ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "2452A93EEB9111EC9B06525400E86DC0", "自动好评回复orderCommentList:", utils.Format4Output(orderCommentList[0], false))
}
if orderComment.IsReplied == 0 && time.Now().Sub(orderComment.CommentCreatedAt) < time.Duration(orderComment.ModifyDuration)*time.Hour { if orderComment.IsReplied == 0 && time.Now().Sub(orderComment.CommentCreatedAt) < time.Duration(orderComment.ModifyDuration)*time.Hour {
if storeDetail, err2 := dao.GetStoreDetail(db, orderComment.StoreID, orderComment.VendorID, ""); err2 == nil { if storeDetail, err2 := dao.GetStoreDetail(db, orderComment.StoreID, orderComment.VendorID, ""); err2 == nil {
if storeDetail.AutoReplyType == model.AutoReplyAll || orderComment.Score > JX_BAD_COMMENTS_MAX_LEVEL && storeDetail.AutoReplyType == model.AutoReplyGoodComment { if storeDetail.AutoReplyType == model.AutoReplyAll || orderComment.Score > JX_BAD_COMMENTS_MAX_LEVEL && storeDetail.AutoReplyType == model.AutoReplyGoodComment {

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

@@ -112,9 +112,11 @@ func (s *DefScheduler) SelfDeliveringAndUpdateStatus(ctx *jxcontext.Context, ven
VendorOrgCode: order.VendorOrgCode, VendorOrgCode: order.VendorOrgCode,
} }
err = dao.CreateEntity(dao.GetDB(), bill) err = dao.CreateEntity(dao.GetDB(), bill)
order.VendorWaybillID = order.VendorOrderID //if order.VendorID == model.VendorIDTaoVegetable {
order.WaybillVendorID = model.VendorJXFakeWL // order.VendorWaybillID = order.VendorOrderID
dao.UpdateEntity(dao.GetDB(), order, "VendorWaybillID", "WaybillVendorID") // order.WaybillVendorID = model.VendorJXFakeWL
// dao.UpdateEntity(dao.GetDB(), order, "VendorWaybillID", "WaybillVendorID")
//}
} }
return err return err
}() }()

6
business/partner/purchase/tao_vegetable/order_utils.go
View File

@@ -64,7 +64,11 @@ func OrderStatusChangeDelivery(order *model.GoodsOrder, orderStatus string) *req
BizOrderId: utils.Int64ToPointer(utils.Str2Int64(order.VendorOrderID)), BizOrderId: utils.Int64ToPointer(utils.Str2Int64(order.VendorOrderID)),
Status: utils.String2Pointer(orderStatus), Status: utils.String2Pointer(orderStatus),
} }
bill, _ := partner.CurOrderManager.LoadWaybill(order.VendorWaybillID, order.WaybillVendorID) var bill *model.Waybill
bill, _ = partner.CurOrderManager.LoadWaybill(order.VendorWaybillID, order.WaybillVendorID)
if bill == nil {
bill, _ = partner.CurOrderManager.LoadWaybill(order.VendorOrderID, model.VendorJXFakeWL)
}
storeDetail, _ := dao.GetStoreDetail(dao.GetDB(), order.JxStoreID, model.VendorIDTaoVegetable, "") storeDetail, _ := dao.GetStoreDetail(dao.GetDB(), order.JxStoreID, model.VendorIDTaoVegetable, "")
if bill != nil { if bill != nil {
if bill.CourierName == "" && bill.CourierMobile == "" { if bill.CourierName == "" && bill.CourierMobile == "" {